Major version bump. Removes GtkFileChooser backends because gtk+-2.14 provides VFS supports on its own now and does not support filesystem backends anymore that aren't provided by GIO and gnome-base/gvfs infrastructure. Make sure to have gnome-base/gvfs if you want remote filesystem support in the standard GTK+ file dialog.

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)

4 files changed, 48 insertions, 396 deletions

diff --git a/gnome-base/libgnomeui/ChangeLog b/gnome-base/libgnomeui/ChangeLog
index caa823a663cb..4eef65f59f9e 100644
--- a/gnome-base/libgnomeui/ChangeLog
+++ b/gnome-base/libgnomeui/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-base/libgnomeui
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.162 2008/09/25 14:24:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.163 2008/09/28 05:19:26 leio Exp $
+
+*libgnomeui-2.24.0 (28 Sep 2008)
+
+  28 Sep 2008; Mart Raudsepp <leio@gentoo.org>
+  -files/libgnomeui-2.22.01-fix-thumbnailing-over-gvfs-mounts.patch,
+  -libgnomeui-2.22.01.ebuild, +libgnomeui-2.24.0.ebuild:
+  Major version bump. Removes GtkFileChooser backends because gtk+-2.14
+  provides VFS supports on its own now and does not support filesystem
+  backends anymore that aren't provided by GIO and gnome-base/gvfs
+  infrastructure. Make sure to have gnome-base/gvfs if you want remote
+  filesystem support in the standard GTK+ file dialog.
 
   25 Sep 2008; Jeroen Roovers <jer@gentoo.org> ChangeLog:
   Stable for HPPA (bug #236971).
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
deleted file mode 100644
index 7f24fcc88746..000000000000
--- a/gnome-base/libgnomeui/files/libgnomeui-2.22.01-fix-thumbnailing-over-gvfs-mounts.patch
+++ /dev/null
@@ -1,345 +0,0 @@
---- 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
deleted file mode 100644
index 1c4352e5de03..000000000000
--- a/gnome-base/libgnomeui/libgnomeui-2.22.01.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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"
-}
diff --git a/gnome-base/libgnomeui/libgnomeui-2.24.0.ebuild b/gnome-base/libgnomeui/libgnomeui-2.24.0.ebuild
new file mode 100644
index 000000000000..35c5019d2b8e
--- /dev/null
+++ b/gnome-base/libgnomeui/libgnomeui-2.24.0.ebuild
@@ -0,0 +1,36 @@
+# 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.24.0.ebuild,v 1.1 2008/09/28 05:19:26 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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+# gtk+-2.14 dep instead of 2.12 ensures system doesn't loose VFS capabilities in GtkFilechooser
+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.16
+	>=x11-libs/gtk+-2.14
+	>=gnome-base/gnome-vfs-2.7.3
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-keyring-0.4
+	>=dev-libs/popt-1.5"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+PDEPEND="x11-themes/gnome-icon-theme"
+
+DOCS="AUTHORS ChangeLog NEWS README"