Upstream fix for bug #149165

(Portage version: 2.1.2_pre1-r3)

4 files changed, 111 insertions, 1 deletions

diff --git a/gnome-base/libgnomeui/ChangeLog b/gnome-base/libgnomeui/ChangeLog
index c4f02e7778be..91c3b53dded1 100644
--- a/gnome-base/libgnomeui/ChangeLog
+++ b/gnome-base/libgnomeui/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/libgnomeui
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.122 2006/09/07 03:43:31 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.123 2006/09/27 17:29:23 dang Exp $
+
+*libgnomeui-2.16.0-r1 (27 Sep 2006)
+
+  27 Sep 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/libgnomeui-2.16.0-file-selector.patch,
+  +libgnomeui-2.16.0-r1.ebuild:
+  Upstream fix for bug #149165
 
 *libgnomeui-2.16.0 (07 Sep 2006)
 
diff --git a/gnome-base/libgnomeui/files/digest-libgnomeui-2.16.0-r1 b/gnome-base/libgnomeui/files/digest-libgnomeui-2.16.0-r1
new file mode 100644
index 000000000000..e9d24e81b352
--- /dev/null
+++ b/gnome-base/libgnomeui/files/digest-libgnomeui-2.16.0-r1
@@ -0,0 +1,3 @@
+MD5 fc8417a6ec484b5f618df9e90605b8e3 libgnomeui-2.16.0.tar.bz2 1458599
+RMD160 271b52580c8a9d1ab9a17605c84f74b7b16b4bd4 libgnomeui-2.16.0.tar.bz2 1458599
+SHA256 85d51d6067034d1f12e8506ee008e355f3056b789c1538e105a48e513c1a8704 libgnomeui-2.16.0.tar.bz2 1458599
diff --git a/gnome-base/libgnomeui/files/libgnomeui-2.16.0-file-selector.patch b/gnome-base/libgnomeui/files/libgnomeui-2.16.0-file-selector.patch
new file mode 100644
index 000000000000..06291328cd30
--- /dev/null
+++ b/gnome-base/libgnomeui/files/libgnomeui-2.16.0-file-selector.patch
@@ -0,0 +1,53 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN libgnomeui-2.16.0.orig/file-chooser/gtkfilesystemgnomevfs.c libgnomeui-2.16.0/file-chooser/gtkfilesystemgnomevfs.c
+--- libgnomeui-2.16.0.orig/file-chooser/gtkfilesystemgnomevfs.c	2006-09-04 10:10:02.000000000 -0400
++++ libgnomeui-2.16.0/file-chooser/gtkfilesystemgnomevfs.c	2006-09-27 13:12:55.000000000 -0400
+@@ -367,6 +367,7 @@
+ 				     gpointer                  user_data);
+ 
+ static gboolean execute_vfs_callbacks_idle (gpointer data);
++static void     execute_vfs_callbacks      (gpointer data);
+ 
+ static gchar *make_child_uri (const gchar *base_uri,
+ 			      const gchar *child_name,
+@@ -612,7 +613,7 @@
+       system_vfs->execute_vfs_callbacks_idle_id = 0;
+ 
+       /* call pending callbacks */
+-      execute_vfs_callbacks_idle (system_vfs);
++      execute_vfs_callbacks (system_vfs);
+     }
+ 
+   /* cancel pending VFS operations */
+@@ -3538,15 +3539,13 @@
+ }
+ 
+ /* some code for making callback calls from idle */
+-static gboolean
+-execute_vfs_callbacks_idle (gpointer data)
++static void
++execute_vfs_callbacks (gpointer data)
+ {
+   GSList *l;
+   gboolean unref_file_system = TRUE;
+   GtkFileSystemGnomeVFS *system_vfs = GTK_FILE_SYSTEM_GNOME_VFS (data);
+ 
+-  GDK_THREADS_ENTER ();
+-
+   if (!system_vfs->execute_vfs_callbacks_idle_id)
+     unref_file_system = FALSE;
+   else
+@@ -3568,6 +3567,14 @@
+     g_object_unref (system_vfs);
+ 
+   system_vfs->execute_vfs_callbacks_idle_id = 0;
++}
++
++static gboolean
++execute_vfs_callbacks_idle (gpointer data)
++{
++  GDK_THREADS_ENTER ();
++
++  execute_vfs_callbacks (data);
+ 
+   GDK_THREADS_LEAVE ();
+ 
diff --git a/gnome-base/libgnomeui/libgnomeui-2.16.0-r1.ebuild b/gnome-base/libgnomeui/libgnomeui-2.16.0-r1.ebuild
new file mode 100644
index 000000000000..15f46ab39d15
--- /dev/null
+++ b/gnome-base/libgnomeui/libgnomeui-2.16.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.16.0-r1.ebuild,v 1.1 2006/09/27 17:29:23 dang Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="User Interface routines for Gnome"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc jpeg"
+
+RDEPEND=">=gnome-base/libgnome-2.13.7
+	>=gnome-base/libgnomecanvas-2
+	>=gnome-base/libbonoboui-2.13.1
+	>=gnome-base/gconf-2
+	>=x11-libs/pango-1.1.2
+	>=x11-libs/gtk+-2.9
+	>=gnome-base/gnome-vfs-2.7.3
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-keyring-0.4
+	>=dev-libs/popt-1.5
+	>=dev-libs/glib-2.8
+	jpeg? ( media-libs/jpeg )"
+
+DEPEND="${RDEPEND}
+	  sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+PDEPEND="x11-themes/gnome-icon-theme"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="$(use_with jpeg libjpeg)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix bug #149165
+	epatch ${FILESDIR}/${P}-file-selector.patch
+}