Upstream fix for bug #149165

Package-Manager: portage-2.1.2_pre1-r3

5 files changed, 126 insertions, 15 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/Manifest b/gnome-base/libgnomeui/Manifest
index 3a0e2d3ae5fe..be5d636992d3 100644
--- a/gnome-base/libgnomeui/Manifest
+++ b/gnome-base/libgnomeui/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libgnomeui-2.10.1-gentoo.patch 3902 RMD160 20bd4a2222975d74d3303028a7a66ea88fa05c63 SHA1 d05e0a5f0704e04a5e8063256ee07925dc37c5c4 SHA256 d64d034d76aff735e46a50ebe1480b0fe9d5455c1b5fee17906ba8ee92470d7f
 MD5 675ca0714915ab850a823d726c0c5f4c files/libgnomeui-2.10.1-gentoo.patch 3902
 RMD160 20bd4a2222975d74d3303028a7a66ea88fa05c63 files/libgnomeui-2.10.1-gentoo.patch 3902
@@ -9,6 +6,10 @@ AUX libgnomeui-2.13.2-gentoo.patch 3851 RMD160 7939b9a03e8eed1e04a2b2482a2a185c9
 MD5 b7ab109f9a0fa0592832f15427911d8a files/libgnomeui-2.13.2-gentoo.patch 3851
 RMD160 7939b9a03e8eed1e04a2b2482a2a185c99d9254f files/libgnomeui-2.13.2-gentoo.patch 3851
 SHA256 db4a93f86075ff1b719de5a4342c9371cd2d887453d7c7be4a39525534178db5 files/libgnomeui-2.13.2-gentoo.patch 3851
+AUX libgnomeui-2.16.0-file-selector.patch 1601 RMD160 48a349915473b5aa0b2e2d332e961bbc645b8ded SHA1 d08e6b39342491ac47427665b1169cecd4a2a866 SHA256 a25b38fe618c4b8f1e711269a4e4d167fc5387e6b56cd99f59508a5d5b3c0670
+MD5 f60b52ed3dde65e0dde632cd67a1e158 files/libgnomeui-2.16.0-file-selector.patch 1601
+RMD160 48a349915473b5aa0b2e2d332e961bbc645b8ded files/libgnomeui-2.16.0-file-selector.patch 1601
+SHA256 a25b38fe618c4b8f1e711269a4e4d167fc5387e6b56cd99f59508a5d5b3c0670 files/libgnomeui-2.16.0-file-selector.patch 1601
 AUX libgnomeui-2.8.0-ditch_ancient_pics.patch 505 RMD160 cdba46b36bb82187b5c91616ff11303e7cb7b4e1 SHA1 ce89d17f3a909955e174a843eb6bf1d7173e0b9d SHA256 ad344da3b6d62633463a33388eb5d6673549016f1b89589db2eede7e37abcb63
 MD5 4becd0494324e4349c245e2b95b0f663 files/libgnomeui-2.8.0-ditch_ancient_pics.patch 505
 RMD160 cdba46b36bb82187b5c91616ff11303e7cb7b4e1 files/libgnomeui-2.8.0-ditch_ancient_pics.patch 505
@@ -34,14 +35,18 @@ EBUILD libgnomeui-2.14.1.ebuild 1360 RMD160 e75b0e2ef8c703dc2f4064c7fd1399aaf036
 MD5 3221380236ba5a1904b2ee4f1f6c6b29 libgnomeui-2.14.1.ebuild 1360
 RMD160 e75b0e2ef8c703dc2f4064c7fd1399aaf03669c1 libgnomeui-2.14.1.ebuild 1360
 SHA256 150f1b06e9ce64917aebc614a8d0d3363b8fef4e05b7afe5414d83359b9caaf0 libgnomeui-2.14.1.ebuild 1360
+EBUILD libgnomeui-2.16.0-r1.ebuild 1132 RMD160 1f3347f16a8601859a45af66960be0f06c39ed3d SHA1 5fb7063873b2ab6eab7ea5bffdc5817588c53a76 SHA256 375e405102503a809b2fb8c6b20e15beba2e585c2c2cf1242d104f2ac69081a1
+MD5 9ae421a9053dcf39e63346d08b5ee610 libgnomeui-2.16.0-r1.ebuild 1132
+RMD160 1f3347f16a8601859a45af66960be0f06c39ed3d libgnomeui-2.16.0-r1.ebuild 1132
+SHA256 375e405102503a809b2fb8c6b20e15beba2e585c2c2cf1242d104f2ac69081a1 libgnomeui-2.16.0-r1.ebuild 1132
 EBUILD libgnomeui-2.16.0.ebuild 1027 RMD160 a9bcdb3a2bb539ccb32521a2906c1756fe9ecd6d SHA1 c95000a8eae698bd3e7fcfd116dd2df68cbf727a SHA256 bb3cdd988c2614c9bd69892815fc92ff5926a54badb28a4881493c8fc4845332
 MD5 77382bd64d4b0af162607a6286d53f32 libgnomeui-2.16.0.ebuild 1027
 RMD160 a9bcdb3a2bb539ccb32521a2906c1756fe9ecd6d libgnomeui-2.16.0.ebuild 1027
 SHA256 bb3cdd988c2614c9bd69892815fc92ff5926a54badb28a4881493c8fc4845332 libgnomeui-2.16.0.ebuild 1027
-MISC ChangeLog 14377 RMD160 58df751e1be4d5715eb349a21ccbdc563ffea8a4 SHA1 2034c00b3652e8132aeffb76a03053953be5610c SHA256 1e67a22b1fdeb12aa7247fccc62196d3cc4d2582dd691590baa2cafd1f6d7a42
-MD5 3925e9968fa3b8e3b848190486e44fca ChangeLog 14377
-RMD160 58df751e1be4d5715eb349a21ccbdc563ffea8a4 ChangeLog 14377
-SHA256 1e67a22b1fdeb12aa7247fccc62196d3cc4d2582dd691590baa2cafd1f6d7a42 ChangeLog 14377
+MISC ChangeLog 14577 RMD160 a8e94668707f24e84240ffd69048564a93126eaa SHA1 c2bd943dc18ae2b982158d42fa4308079108fb4d SHA256 6cdf343a944bb0f1db00a377db967da3fb5db087323bef577709f2ffc1aff61f
+MD5 0cb3452f57c863271defced6941f8c2d ChangeLog 14577
+RMD160 a8e94668707f24e84240ffd69048564a93126eaa ChangeLog 14577
+SHA256 6cdf343a944bb0f1db00a377db967da3fb5db087323bef577709f2ffc1aff61f ChangeLog 14577
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -61,10 +66,6 @@ SHA256 16f2e959931360dfa6db7351c6c74f2229493b42e2770697de93e2bdb6fc5ca0 files/di
 MD5 fe1462078ab389c25b99781151a1f3ea files/digest-libgnomeui-2.16.0 259
 RMD160 9f23b63789b1338da38df5800603366bd3ca5ea9 files/digest-libgnomeui-2.16.0 259
 SHA256 035167eb4be55a83d25f46c0496f5748015b6b84434a3dec61931a872f261112 files/digest-libgnomeui-2.16.0 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFE/5V0omPajV0RnrERAu1pAKCButLy2f4ToBoqQxEbfEAZg0NLrACfU8Gl
-Aaslu8YaQopOv8+gc3JIzsg=
-=9vVM
------END PGP SIGNATURE-----
+MD5 fe1462078ab389c25b99781151a1f3ea files/digest-libgnomeui-2.16.0-r1 259
+RMD160 9f23b63789b1338da38df5800603366bd3ca5ea9 files/digest-libgnomeui-2.16.0-r1 259
+SHA256 035167eb4be55a83d25f46c0496f5748015b6b84434a3dec61931a872f261112 files/digest-libgnomeui-2.16.0-r1 259
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
+}