Fix compatibility with gtk+ 2.14.3

(Portage version: 2.1.4.4)

3 files changed, 63 insertions, 1 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/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 )