Fix compatibility with gtk+ 2.14.3

Package-Manager: portage-2.1.4.4

4 files changed, 70 insertions, 6 deletions

diff --git a/dev-ruby/ruby-gtk2/ChangeLog b/dev-ruby/ruby-gtk2/ChangeLog
index 3217c34893ee..98a1be83ec32 100644
--- a/dev-ruby/ruby-gtk2/ChangeLog
+++ b/dev-ruby/ruby-gtk2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/ruby-gtk2
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gtk2/ChangeLog,v 1.59 2008/04/12 08:48:56 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gtk2/ChangeLog,v 1.60 2008/09/28 07:55:39 graaff Exp $
+
+*ruby-gtk2-0.16.0-r4 (28 Sep 2008)
+
+  28 Sep 2008; Hans de Graaff <graaff@gentoo.org>
+  +files/ruby-gtk2-0.16.0-gtk-file-system-error.patch,
+  +ruby-gtk2-0.16.0-r4.ebuild:
+  Fix compatibility with gtk+ 2.14.3 by removing wrapping for GtkFileSystem
+  stuff that should not have been wrapped in the first place. Fixes bug #238837.
 
 *ruby-gtk2-0.16.0-r3 (12 Apr 2008)
 
diff --git a/dev-ruby/ruby-gtk2/Manifest b/dev-ruby/ruby-gtk2/Manifest
index 790c34f37ba9..9bf561788cfd 100644
--- a/dev-ruby/ruby-gtk2/Manifest
+++ b/dev-ruby/ruby-gtk2/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA1
 
 AUX ruby-gtk2-0.16.0-format-string.patch 707 RMD160 be61bb6c29aa907aa08fe781c6f06d80171651e9 SHA1 6bf0c8ffe3d520fab981b3e055b150a213b4ba61 SHA256 f8023d997396ba31383f5a23ec661955dae3a2710ac8666d9ece5eaaf11bd82f
+AUX ruby-gtk2-0.16.0-gtk-file-system-error.patch 1522 RMD160 e655aabf5f17ae2eb14886f19d81cc2e23df5afc SHA1 c07b5cb48012d810f388128967e5ee97f97d6a06 SHA256 d21e2840bbfdacaf5244c1c266fe0e1d7d831226b9f20f6bf6ce7cc21e990327
 AUX ruby-gtk2-0.16.0-iconview-get-path.patch 627 RMD160 e7927a4a7b9434888c58762b2913fc84b35fac99 SHA1 4c6ea571ce6dcdf82ded605bf3442b3a6942b2ed SHA256 ed0b256e6389b1ca6ce5f0725bd8050a2f4855a6906455a73d6b98b8f963aaf4
 AUX ruby-gtk2-0.16.0-typedef.patch 549 RMD160 3af4208381e939c74e64c33708b16cb13c775f52 SHA1 a5dc6d0ebd9d0b453c128d4a60d5a2a98dc8a893 SHA256 4b0cf22b2a80bbc921cd5791cb26366411c7954cbf6eebd627fea4f95c3ff14f
 DIST ruby-gnome2-all-0.16.0.tar.gz 1208856 RMD160 c83c7cdcf633ad5cc213180f641a6c8f18002a9c SHA1 488f6c1f139060e005f336c9c854c4dc5b3e6b7c SHA256 0910f08c5224bc39aad66c46b506e5c97e260475ede6b427d5365a9ef2d69ad4
 EBUILD ruby-gtk2-0.16.0-r2.ebuild 625 RMD160 729803be361eb6594a5eb5a1b18fed378f4942f7 SHA1 1c85711746c0e03704f4c5c806f4f83389ca536a SHA256 8768157e205fb3c016d2f91772bcf0577c9b73055739e97ec974db3b04b1f2d6
 EBUILD ruby-gtk2-0.16.0-r3.ebuild 680 RMD160 71e7a2243561933837a91dc7542dc39b2717d54f SHA1 e89a8fff7b90ae1a545e9eac9afd3490f423b777 SHA256 ad49e9820c99c644ddbd83f5d15134b3b5a8a794f6127f285d846c8d03002e4b
-MISC ChangeLog 8366 RMD160 18142be12123dc352d1dfd49645cf49927ceb9ce SHA1 1960af2b85e4b4b5e463be41df4d2f745323800f SHA256 a12dc0ae577e28409bbf8654ee3f6581d514201998f7508473d7b186655c032c
+EBUILD ruby-gtk2-0.16.0-r4.ebuild 728 RMD160 9a1421640a142db7a0a79d563797f081c0bc3be1 SHA1 3051dc8935f24b82f761c130053b53f31aa67cc7 SHA256 53cf5a67cf6dab83c0c2907a1b94d0b52b559855a4777bf3ed03607e07ef397a
+MISC ChangeLog 8696 RMD160 49a195c7cea571288b6071a38fdb9d963e056031 SHA1 1d27f47cbd92c5844d0172c9d88e27a56f297c2d SHA256 285a610790d45149cb3b455649c4ba0b49e3924d643c57b0dfa1bb47d9dc75e3
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFIAHeEQUozDL2JlH4RAnpgAJ9tkmcPGrTEIJxVj+IWxpC1yQvVwQCePqJs
-5TQdo0yfeePB8GDXzpP2B3A=
-=0pLC
+iEYEARECAAYFAkjfOIcACgkQCzgcb6sPj49mPACaArPqAnGqESe3NfkL3loBbcb3
+IJkAniRlxm6GI0YFvZ21TxfMm4X6VrEW
+=bAp0
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-gtk2/files/ruby-gtk2-0.16.0-gtk-file-system-error.patch b/dev-ruby/ruby-gtk2/files/ruby-gtk2-0.16.0-gtk-file-system-error.patch
new file mode 100644
index 000000000000..561291b48dd1
--- /dev/null
+++ b/dev-ruby/ruby-gtk2/files/ruby-gtk2-0.16.0-gtk-file-system-error.patch
@@ -0,0 +1,33 @@
+Starting with 2.14 the GTK+ FileSystemError is no longer available due
+to the move to GIO internally. This structure was also never intended
+to be exposed, so we are removing it here. See bug
+http://bugs.gentoo.org/show_bug.cgi?id=238837 for more details.
+
+--- gtk/src/rbgtkfilechooser.c.orig	2006-12-29 14:17:28.000000000 +0100
++++ gtk/src/rbgtkfilechooser.c	2008-09-28 09:40:10.573694830 +0200
+@@ -16,10 +16,6 @@
+ 
+ #define _SELF(self) GTK_FILE_CHOOSER(RVAL2GOBJ(self))
+ 
+-/* For error handling */
+-#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
+-#include <gtk/gtkfilesystem.h>
+-
+ static VALUE
+ gslist2ary_free(list)
+     GSList* list;
+@@ -367,14 +363,6 @@
+     /* GtkFileChooserError */
+     G_DEF_ERROR(GTK_FILE_CHOOSER_ERROR, "FileChooserError", mGtk, rb_eRuntimeError, 
+                 GTK_TYPE_FILE_CHOOSER_ERROR);
+-    /* GtkFileSystemError */
+-    fse = G_DEF_ERROR2(GTK_FILE_SYSTEM_ERROR, "FileSystemError", mGtk, rb_eRuntimeError);
+-    rb_define_const(fse, "NONEXISTENT", INT2NUM(GTK_FILE_SYSTEM_ERROR_NONEXISTENT));
+-    rb_define_const(fse, "NOT_FOLDER", INT2NUM(GTK_FILE_SYSTEM_ERROR_NOT_FOLDER));
+-    rb_define_const(fse, "INVALID_URI", INT2NUM(GTK_FILE_SYSTEM_ERROR_INVALID_URI));
+-    rb_define_const(fse, "BAD_FILENAME", INT2NUM(GTK_FILE_SYSTEM_ERROR_BAD_FILENAME));
+-    rb_define_const(fse, "FAILED", INT2NUM(GTK_FILE_SYSTEM_ERROR_FAILED));
+-    rb_define_const(fse, "ALREADY_EXSITS", INT2NUM(GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS));
+ 
+ #if GTK_CHECK_VERSION(2,8,0)
+     /* GtkFileChooserConfirmation */
diff --git a/dev-ruby/ruby-gtk2/ruby-gtk2-0.16.0-r4.ebuild b/dev-ruby/ruby-gtk2/ruby-gtk2-0.16.0-r4.ebuild
new file mode 100644
index 000000000000..21603065b9a3
--- /dev/null
+++ b/dev-ruby/ruby-gtk2/ruby-gtk2-0.16.0-r4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gtk2/ruby-gtk2-0.16.0-r4.ebuild,v 1.1 2008/09/28 07:55:39 graaff Exp $
+
+inherit ruby ruby-gnome2
+
+DESCRIPTION="Ruby Gtk2 bindings"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+USE_RUBY="ruby18 ruby19"
+DEPEND=">=x11-libs/gtk+-2"
+RDEPEND="${DEPEND}
+	dev-ruby/ruby-gdkpixbuf2
+	>=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-pango-${PV}
+	>=dev-ruby/ruby-atk-${PV}"
+
+PATCHES=( "${FILESDIR}"/ruby-gtk2-0.16.0-typedef.patch
+	"${FILESDIR}"/ruby-gtk2-0.16.0-format-string.patch
+	"${FILESDIR}"/${P}-iconview-get-path.patch
+	"${FILESDIR}"/${P}-gtk-file-system-error.patch )