New version for GNOME-2.22. Adds a GIO filechooser backend until gtk+-2.14 itself does it for GNOME-2.24 in the future. Other bug fixes

Package-Manager: portage-2.1.4.4

4 files changed, 412 insertions, 6 deletions

diff --git a/gnome-base/libgnomeui/ChangeLog b/gnome-base/libgnomeui/ChangeLog
index d406de76226a..f87a5dd731a0 100644
--- a/gnome-base/libgnomeui/ChangeLog
+++ b/gnome-base/libgnomeui/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/libgnomeui
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.152 2007/11/29 05:18:07 jer Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.153 2008/03/23 00:25:57 leio Exp $
+
+*libgnomeui-2.22.01 (23 Mar 2008)
+
+  23 Mar 2008; Mart Raudsepp <leio@gentoo.org>
+  +files/libgnomeui-2.22.01-fix-thumbnailing-over-gvfs-mounts.patch,
+  +libgnomeui-2.22.01.ebuild:
+  New version for GNOME-2.22. Adds a GIO filechooser backend until gtk+-2.14
+  itself does it for GNOME-2.24 in the future. Other bug fixes
 
   29 Nov 2007; Jeroen Roovers <jer@gentoo.org> libgnomeui-2.20.1.1.ebuild:
   Stable for HPPA (bug #199740).
diff --git a/gnome-base/libgnomeui/Manifest b/gnome-base/libgnomeui/Manifest
index f84a032ecdc1..455090a1f758 100644
--- a/gnome-base/libgnomeui/Manifest
+++ b/gnome-base/libgnomeui/Manifest
@@ -2,18 +2,21 @@
 Hash: SHA1
 
 AUX libgnomeui-2.19.1-enable-druid.patch 3371 RMD160 5db849ebe6c6f9498e308cb2b0de8afe3192ee4e SHA1 2e568fcc8d02cfa97b1daa08106f3ab85f7b576f SHA256 0dbdc0dc893c480a02c552555ea13ef9077f58e470738a573a196b5fdbf54f01
+AUX libgnomeui-2.22.01-fix-thumbnailing-over-gvfs-mounts.patch 10463 RMD160 8367dce73e1551bda15e56b0d0ed4d0511963adf SHA1 eed129b400ebd3fdf78d0dfe1dd1555b993b06c1 SHA256 ca37e5268d166a033e27e80e4663654755950b091a418af2f973b5eee3d34053
 DIST libgnomeui-2.16.1.tar.bz2 1482097 RMD160 9cb97cb90014df2f477c24b7c41873a74704dff8 SHA1 13154032427c0599ca741de50301cdc3a9ab3088 SHA256 552c34d20f30847429e342e6c6ddeece707b69a5abe9aeeafcfeb65cec2eebd7
 DIST libgnomeui-2.18.1.tar.bz2 1462027 RMD160 e1394f2fa4ba92554b48f5d3a3fd767b60b0c6cd SHA1 20f57e5a73f3d5570d331182dba45ff8943ef659 SHA256 d6eef491e70fcc2c1e5b94f6a8dbb3774443b3b76b1ca5d62bfb5b802df14120
 DIST libgnomeui-2.20.1.1.tar.bz2 1445994 RMD160 90caad97c85250435299923c90ffa730dbdfd288 SHA1 e1704b328de6f6f7130147062b3262b3df77484a SHA256 133933c70234ecd4560cec165034c21c94598c24c34138ed1ee1770f52328cef
+DIST libgnomeui-2.22.01.tar.bz2 1512741 RMD160 9deac98f98acafbfa62a54173ddaa733ac56f34f SHA1 400fe28c6c0f07d105db5e47307e1873686e93bb SHA256 516d2c995fd0acff05be88f75952d7ca2fa68c270f5a60a8b00df823cba289cc
 EBUILD libgnomeui-2.16.1.ebuild 972 RMD160 1da06a15e52ec38c3b5c97aab51d86e7c5a356f7 SHA1 cc22d3a93ecfab6bae9656e1a500697cbb3a5f8a SHA256 95232d2d532d112adb19e7eaad3ca4a5f05358d1a8472d26a0fcff60ba53a0fc
 EBUILD libgnomeui-2.18.1.ebuild 1052 RMD160 77501c1a02aed0aa8e2dcfbeb3990fcccd37ee07 SHA1 d9601f2d482742e2e97edde20692d6f592f16571 SHA256 54183c7925ee07d4238a28f717517aec555f1596d28b6e488829f2c271f1c70f
 EBUILD libgnomeui-2.20.1.1.ebuild 1191 RMD160 88668bbaeadf7ee5e99c9cde853dd2702b7e4455 SHA1 0dccdfb3fbaeb40f8c7c384c622b42eae366e5bd SHA256 a9b202c59b4b628aa0750775ed5b72fcf56ad92e1cec7e31fcf2ba7d576f5fbf
-MISC ChangeLog 18308 RMD160 2aa8947d927048c300d7ac03ec20c58c41f65488 SHA1 4c5c3558a6ea6fef0b13364ccf4ffa2e57d4c7ae SHA256 a6ab63a4b0396a9c4864770088f8ee3f1823ab57a3ca3e8b64b011ec846215db
+EBUILD libgnomeui-2.22.01.ebuild 1376 RMD160 f9acc105727edb471138f4c0528c6eea1bbae274 SHA1 ac24fea1703a3652c79c9ce8eb2d7a64edf0d5b5 SHA256 bb9562325871658c68a2e7804855ffeafef059ca5b133982f7dbed35d8eba38d
+MISC ChangeLog 18631 RMD160 7b0c5640e5e145448d98ba402efbb5d28cdd7fe6 SHA1 3418f7fa015f890117323ff39c3e8b9391248dc4 SHA256 1dccc66e39cba369c113c13624835089a49cbeaf9b3a74079c68e40b4c4dd21f
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkfVuGQACgkQkeYb6olFHJdpGACfbeEU7x+OcQw9kcmOzCWyb5rD
-oc0AoO2zhpMmVT34/mXBwsX7iyWl7t26
-=lEde
+iEYEARECAAYFAkflo5sACgkQkeYb6olFHJfyegCgrGf2gkHYfK8f5FsvCam0cyqC
+40MAoLwstGgPAKLHI9m7EG9TqJIGMVDh
+=FKG4
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnomeui/files/libgnomeui-2.22.01-fix-thumbnailing-over-gvfs-mounts.patch b/gnome-base/libgnomeui/files/libgnomeui-2.22.01-fix-thumbnailing-over-gvfs-mounts.patch
new file mode 100644
index 000000000000..7f24fcc88746
--- /dev/null
+++ b/gnome-base/libgnomeui/files/libgnomeui-2.22.01-fix-thumbnailing-over-gvfs-mounts.patch
@@ -0,0 +1,345 @@
+--- trunk/configure.in	2008/03/12 08:37:37	5583
++++ trunk/configure.in	2008/03/16 09:31:58	5584
+@@ -205,6 +206,7 @@
+   gconf-2.0 >= gconf_required_version dnl
+   pango >= pango_required_version dnl
+   glib-2.0 >= glib_required_version
++  gio-2.0 >= gio_required_version
+   gnome-vfs-2.0 >= gnomevfs_required_version dnl
+   $gnome_keyring_requirement"
+ PKG_CHECK_MODULES(LIBGNOMEUI, [$GNOMEUI_MODULES])
+--- trunk/configure	2008-03-23 02:13:17.000000000 +0200
++++ trunk/configure	2008-03-23 02:13:24.000000000 +0200
+@@ -28507,6 +28507,7 @@
+ 
+ 
+ GNOMEUI_MODULES="  libxml-2.0 >= 2.4.20   libgnome-2.0 >= 2.13.7   libgnomecanvas-2.0 >= 2.0.0   libbonoboui-2.0 >= 2.13.1   gconf-2.0 >= 1.1.11   pango >= 1.1.2   glib-2.0 >= 2.15.0
++  gio-2.0 >= 2.15.2
+   gnome-vfs-2.0 >= 2.7.3   $gnome_keyring_requirement"
+ 
+ pkg_failed=no
+--- trunk/libgnomeui/gnome-vfs-util.c	2008/03/12 08:37:37	5583
++++ trunk/libgnomeui/gnome-vfs-util.c	2008/03/16 09:31:58	5584
+@@ -26,6 +26,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <glib-object.h>
++#include <gio/gio.h>
+ 
+ #include "gnome-vfs-util.h"
+ 
+@@ -48,7 +49,10 @@
+ #define LOAD_BUFFER_SIZE 4096
+ 
+ struct GnomeGdkPixbufAsyncHandle {
+-    GnomeVFSAsyncHandle *vfs_handle;
++    GFile *file;
++    GFileInputStream *file_input_stream;
++    GCancellable *cancellable;
++
+     GnomeGdkPixbufLoadCallback load_callback;
+     GnomeGdkPixbufDoneCallback done_callback;
+     gpointer callback_data;
+@@ -65,18 +69,12 @@
+ } SizePrepareContext;
+ 
+ 
+-static void file_opened_callback (GnomeVFSAsyncHandle      *vfs_handle,
+-                                  GnomeVFSResult            result,
+-                                  gpointer                  callback_data);
+-static void file_read_callback   (GnomeVFSAsyncHandle      *vfs_handle,
+-                                  GnomeVFSResult            result,
+-                                  gpointer                  buffer,
+-                                  GnomeVFSFileSize          bytes_requested,
+-                                  GnomeVFSFileSize          bytes_read,
+-                                  gpointer                  callback_data);
+-static void file_closed_callback (GnomeVFSAsyncHandle      *handle,
+-                                  GnomeVFSResult            result,
+-                                  gpointer                  callback_data);
++static void input_stream_read_callback (GObject *source_object,
++					GAsyncResult *res,
++					gpointer user_data);
++static void input_stream_ready_callback (GObject *source_object,
++					 GAsyncResult *res,
++					 gpointer user_data);
+ static void load_done            (GnomeGdkPixbufAsyncHandle *handle,
+                                   GnomeVFSResult            result,
+                                   GdkPixbuf                *pixbuf);
+@@ -165,7 +163,6 @@
+ 					gboolean    preserve_aspect_ratio)
+ {
+     GnomeVFSResult result;
+-    GnomeVFSHandle *handle;
+     char buffer[LOAD_BUFFER_SIZE];
+     GnomeVFSFileSize bytes_read;
+     GdkPixbufLoader *loader;
+@@ -174,13 +171,15 @@
+     GdkPixbufAnimationIter *iter;
+     gboolean has_frame;
+     SizePrepareContext info;
++    GFile *file;
++    GFileInputStream *file_input_stream;
+ 
+     g_return_val_if_fail (uri != NULL, NULL);
+ 
+-    result = gnome_vfs_open (&handle,
+-			     uri,
+-			     GNOME_VFS_OPEN_READ);
+-    if (result != GNOME_VFS_OK) {
++    file = g_file_new_for_uri (uri);
++    file_input_stream = g_file_read (file, NULL, NULL);
++    if (file_input_stream == NULL) {
++	g_object_unref (file);
+ 	return NULL;
+     }
+ 
+@@ -195,17 +194,22 @@
+ 
+     has_frame = FALSE;
+ 
++    result = GNOME_VFS_ERROR_GENERIC;
+     while (!has_frame) {
+-	result = gnome_vfs_read (handle,
+-				 buffer,
+-				 sizeof (buffer),
+-				 &bytes_read);
+-	if (result != GNOME_VFS_OK) {
++
++	bytes_read = g_input_stream_read (G_INPUT_STREAM (file_input_stream),
++					  buffer,
++					  sizeof (buffer),
++					  NULL,
++					  NULL);
++	if (bytes_read == -1) {
+ 	    break;
+ 	}
++	result = GNOME_VFS_OK;
+ 	if (bytes_read == 0) {
+ 	    break;
+ 	}
++
+ 	if (!gdk_pixbuf_loader_write (loader,
+ 				      (unsigned char *)buffer,
+ 				      bytes_read,
+@@ -226,13 +230,17 @@
+ 
+     gdk_pixbuf_loader_close (loader, NULL);
+     
+-    if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_EOF) {
++    if (result != GNOME_VFS_OK) {
+ 	g_object_unref (G_OBJECT (loader));
+-	gnome_vfs_close (handle);
++	g_input_stream_close (G_INPUT_STREAM (file_input_stream), NULL, NULL);
++	g_object_unref (file_input_stream);
++	g_object_unref (file);
+ 	return NULL;
+     }
+ 
+-    gnome_vfs_close (handle);
++    g_input_stream_close (G_INPUT_STREAM (file_input_stream), NULL, NULL);
++    g_object_unref (file_input_stream);
++    g_object_unref (file);
+ 
+     pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+     if (pixbuf != NULL) {
+@@ -260,101 +268,89 @@
+     handle->done_callback = done_callback;
+     handle->callback_data = callback_data;
+ 
+-    gnome_vfs_async_open (&handle->vfs_handle,
+-			  uri,
+-			  GNOME_VFS_OPEN_READ,
+-			  GNOME_VFS_PRIORITY_DEFAULT,
+-			  file_opened_callback,
+-			  handle);
+-
++    handle->file = g_file_new_for_uri (uri);
++    handle->cancellable = g_cancellable_new ();
++    g_file_read_async (handle->file, 
++		       G_PRIORITY_DEFAULT, 
++		       handle->cancellable, 
++		       input_stream_ready_callback, 
++		       handle);
+     return handle;
+ }
+ 
+-static void
+-file_opened_callback (GnomeVFSAsyncHandle *vfs_handle,
+-		      GnomeVFSResult result,
+-		      gpointer callback_data)
++static void 
++input_stream_ready_callback (GObject *source_object,
++			     GAsyncResult *res,
++			     gpointer user_data)
+ {
+-    GnomeGdkPixbufAsyncHandle *handle;
++    GError *error = NULL;
++    GnomeGdkPixbufAsyncHandle *handle = user_data;
+ 
+-    handle = callback_data;
+-    g_assert (handle->vfs_handle == vfs_handle);
+-
+-    if (result != GNOME_VFS_OK) {
+-	load_done (handle, result, NULL);
++    handle->file_input_stream = g_file_read_finish (G_FILE (source_object),
++						    res, NULL);
++    if (handle->file_input_stream == NULL) {
++	/* TODO: could map the GError more precisely to the GnomeVFSError */
++	load_done (handle, GNOME_VFS_ERROR_GENERIC, NULL);
+ 	return;
+     }
+ 
+     handle->loader = gdk_pixbuf_loader_new ();
+ 
+-    gnome_vfs_async_read (handle->vfs_handle,
+-			  handle->buffer,
+-			  sizeof (handle->buffer),
+-			  file_read_callback,
+-			  handle);
++    g_input_stream_read_async (G_INPUT_STREAM (handle->file_input_stream),
++			       handle->buffer,
++			       sizeof (handle->buffer),
++			       G_PRIORITY_DEFAULT,
++			       handle->cancellable,
++			       input_stream_read_callback,
++			       handle);
+ }
+ 
+-static void
+-file_read_callback (GnomeVFSAsyncHandle *vfs_handle,
+-		    GnomeVFSResult result,
+-		    gpointer buffer,
+-		    GnomeVFSFileSize bytes_requested,
+-		    GnomeVFSFileSize bytes_read,
+-		    gpointer callback_data)
++static void 
++input_stream_read_callback (GObject *source_object,
++			    GAsyncResult *res,
++			    gpointer user_data)
+ {
+-    GnomeGdkPixbufAsyncHandle *handle;
+-
+-    handle = callback_data;
+-    g_assert (handle->vfs_handle == vfs_handle);
+-    g_assert (handle->buffer == buffer);
++    GnomeGdkPixbufAsyncHandle *handle = user_data;
++    gssize bytes_read;
++    GnomeVFSResult result;
+ 
+-    if (result == GNOME_VFS_OK && bytes_read != 0) {
++    bytes_read = g_input_stream_read_finish (G_INPUT_STREAM (source_object),
++					     res, NULL);
++    if (bytes_read == -1) {
++	/* TODO: could map the GError more precisely */
++	result = GNOME_VFS_ERROR_GENERIC;
++    } else if (bytes_read > 0) {
+ 	if (!gdk_pixbuf_loader_write (handle->loader,
+-				      buffer,
++				      (const guchar *) handle->buffer,
+ 				      bytes_read,
+ 				      NULL)) {
+ 	    result = GNOME_VFS_ERROR_WRONG_FORMAT;
++	} else {
++	    /* read more */
++	    g_input_stream_read_async (G_INPUT_STREAM (handle->file_input_stream),
++				       handle->buffer,
++				       sizeof (handle->buffer),
++				       G_PRIORITY_DEFAULT,
++				       handle->cancellable,
++				       input_stream_read_callback,
++				       handle);
++	    return;
+ 	}
+-	gnome_vfs_async_read (handle->vfs_handle,
+-			      handle->buffer,
+-			      sizeof (handle->buffer),
+-			      file_read_callback,
+-			      handle);
+-	return;
++    } else {
++	/* EOF */
++	result = GNOME_VFS_OK;
+     }
+ 
+-    switch (result) {
+-    case GNOME_VFS_OK:
+-	if (bytes_read == 0) {
+-	    GdkPixbuf *pixbuf;
+-
+-	    pixbuf = gdk_pixbuf_loader_get_pixbuf (handle->loader);
+-	    load_done (handle, result, pixbuf);
+-	}
+-	break;
+-    case GNOME_VFS_ERROR_EOF:
+-	{
+-	    GdkPixbuf *pixbuf;
+-
+-	    pixbuf = gdk_pixbuf_loader_get_pixbuf (handle->loader);
+-	    load_done (handle, pixbuf ? GNOME_VFS_OK : result, pixbuf);
+-	}
+-	break;
+-    default:
++    if (result == GNOME_VFS_OK) {
++	GdkPixbuf *pixbuf;
++	pixbuf = gdk_pixbuf_loader_get_pixbuf (handle->loader);
++	load_done (handle, result, pixbuf);
++    } else {
+ 	load_done (handle, result, NULL);
+-	break;
+     }
+ }
+ 
+ static void
+-file_closed_callback (GnomeVFSAsyncHandle *handle,
+-		      GnomeVFSResult result,
+-		      gpointer callback_data)
+-{
+-    g_assert (callback_data == NULL);
+-}
+-
+-static void
+ free_pixbuf_load_handle (GnomeGdkPixbufAsyncHandle *handle)
+ {
+     if (handle->done_callback)
+@@ -363,6 +359,17 @@
+ 	gdk_pixbuf_loader_close (handle->loader, NULL);
+ 	g_object_unref (G_OBJECT (handle->loader));
+     }
++    if (handle->file_input_stream != NULL) {
++        g_input_stream_close (G_INPUT_STREAM (handle->file_input_stream), NULL, NULL);
++        g_object_unref (handle->file_input_stream);
++    }
++    if (handle->file != NULL) {
++        g_object_unref (handle->file);
++    }
++    if (handle->cancellable != NULL) {
++        g_object_unref (handle->cancellable);
++    }
++
+     g_free (handle);
+ }
+ 
+@@ -371,12 +378,6 @@
+ 	   GnomeVFSResult result,
+ 	   GdkPixbuf *pixbuf)
+ {
+-    if (handle->vfs_handle != NULL) {
+-	if (result != GNOME_VFS_OK)
+-	    gnome_vfs_async_cancel (handle->vfs_handle);
+-	else
+-	    gnome_vfs_async_close (handle->vfs_handle, file_closed_callback, NULL);
+-    }
+     (* handle->load_callback) (handle, result, pixbuf, handle->callback_data);
+     free_pixbuf_load_handle (handle);
+ }
+@@ -387,8 +388,8 @@
+     if (handle == NULL) {
+ 	return;
+     }
+-    if (handle->vfs_handle != NULL) {
+-	gnome_vfs_async_cancel (handle->vfs_handle);
++    if (handle->cancellable != NULL) {
++	g_cancellable_cancel (handle->cancellable);
+     }
+     free_pixbuf_load_handle (handle);
+ }
diff --git a/gnome-base/libgnomeui/libgnomeui-2.22.01.ebuild b/gnome-base/libgnomeui/libgnomeui-2.22.01.ebuild
new file mode 100644
index 000000000000..1c4352e5de03
--- /dev/null
+++ b/gnome-base/libgnomeui/libgnomeui-2.22.01.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.22.01.ebuild,v 1.1 2008/03/23 00:25:57 leio 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 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc jpeg"
+
+RDEPEND=">=dev-libs/libxml2-2.4.20
+		 >=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
+		 >=dev-libs/glib-2.15.2
+		 >=x11-libs/gtk+-2.11.5
+		 >=gnome-base/gnome-vfs-2.7.3
+		 >=gnome-base/libglade-2
+		 >=gnome-base/gnome-keyring-0.4
+		 >=dev-libs/popt-1.5
+		 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
+
+	# Re-enable deprecated gnome druid code
+	epatch "${FILESDIR}"/${PN}-2.19.1-enable-druid.patch
+
+	# Fix thumbnailing on gphoto2:// trash:// and obex:// etc. Upstream bug #517276
+	epatch "${FILESDIR}/${P}-fix-thumbnailing-over-gvfs-mounts.patch"
+}