fix bug #200897 and cleanup old revisions and patches

(Portage version: 2.1.4_rc14)

7 files changed, 163 insertions, 174 deletions

diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.3-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.3-r1
deleted file mode 100644
index 11e08a39e511..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 586d6fe3740385c000a864d5e2cf8215 gnome-vfs-2.16.3.tar.bz2 1900424
-RMD160 9600bb4f4630d48600c1469fa5077d8e969a10cc gnome-vfs-2.16.3.tar.bz2 1900424
-SHA256 657df4d40dd1c8cbc9a266b9f38fea36019ef8a917eafcd3c38c840b8e9c7777 gnome-vfs-2.16.3.tar.bz2 1900424
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.20.1-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.20.1-r1
new file mode 100644
index 000000000000..b7700a4d7254
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.20.1-r1
@@ -0,0 +1,3 @@
+MD5 a350a5a3e201951d7e7867d0900df423 gnome-vfs-2.20.1.tar.bz2 1890300
+RMD160 faa5fffb5495d1e161cb6c3b47612cf39cbb1629 gnome-vfs-2.20.1.tar.bz2 1890300
+SHA256 37475d17350b0e54b2e0b7bdcd7effd04eafd96b4b07604ff7d941377dd112d3 gnome-vfs-2.20.1.tar.bz2 1890300
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2-CAN-2005-0706.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2-CAN-2005-0706.patch
deleted file mode 100644
index 97a4ffbfad2c..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2-CAN-2005-0706.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-vfs/modules/cdda-cddb.c.orig	2005-03-11 21:26:03.789158107 -0500
-+++ gnome-vfs/modules/cdda-cddb.c	2005-03-11 21:26:47.324426192 -0500
-@@ -440,7 +440,7 @@
-     query->query_match=MATCH_INEXACT;
-     query->query_matches=0;
- 
--    while(!CDDBReadLine(socket,inbuffer,256)) {
-+    while(query->query_matches < MAX_INEXACT_MATCHES && !CDDBReadLine(socket,inbuffer,256)) {
-       query->query_list[query->query_matches].list_genre=
- 	CDDBGenreValue(ChopWhite(strtok(inbuffer," ")));
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.14.2-http_module-undef-neon-symbols.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.14.2-http_module-undef-neon-symbols.patch
deleted file mode 100644
index 3297ab7df9f2..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.14.2-http_module-undef-neon-symbols.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-On hardened there are problems when loading modules with undefined symbols that
-do not resolve, so add stubs and make sure the neon symbols are local for
-libhttp.so.
-
-Martin Schlemmer <azarah@nosferatu.za.org> (22 July 2006)
-
-diff -urpN gnome-vfs-2.14.2/imported/neon/Makefile.am gnome-vfs-2.14.2.az/imported/neon/Makefile.am
---- gnome-vfs-2.14.2/imported/neon/Makefile.am	2006-01-08 18:53:09.000000000 +0200
-+++ gnome-vfs-2.14.2.az/imported/neon/Makefile.am	2006-07-22 15:30:26.000000000 +0200
-@@ -53,8 +53,9 @@ NEON_BASE_SOURCES = ne_request.c ne_sess
- 	ne_uri.c ne_dates.c ne_alloc.c  	\
- 	ne_md5.c ne_utils.c    			\
- 	ne_auth.c 				\
--	ne_redirect.c		\
--	ne_compress.c
-+	ne_redirect.c				\
-+	ne_compress.c				\
-+	ne_stubs.c
- 
- NEON_DAV_SOURCES = \
- 	ne_207.c ne_xml.c \
-diff -urpN gnome-vfs-2.14.2/imported/neon/ne_stubs.c gnome-vfs-2.14.2.az/imported/neon/ne_stubs.c
---- gnome-vfs-2.14.2/imported/neon/ne_stubs.c	1970-01-01 02:00:00.000000000 +0200
-+++ gnome-vfs-2.14.2.az/imported/neon/ne_stubs.c	2006-07-22 15:29:49.000000000 +0200
-@@ -0,0 +1,28 @@
-+#include "ne_ssl.h"
-+#include "ne_request.h"
-+#include "ne_xml.h"
-+
-+/*
-+ * Stubs so that the functions are not marked as UND in the global symbol
-+ * table.  Assuming that nothing that calls them are actually used in
-+ * gnome-vfs, they are bare.
-+ */
-+
-+void ne_ssl_context_trustcert(ne_ssl_context *ctx, const ne_ssl_certificate *cert)
-+{
-+  NE_DEBUG(NE_DBG_SSL, "SSL: stub ne_ssl_context_trustcert() in use\n");
-+  return;
-+}
-+
-+int ne_xml_parse_response(ne_request *req, ne_xml_parser *parser)
-+{
-+  NE_DEBUG(NE_DBG_XMLPARSE, "XML: stub ne_xml_parse_response() in use\n");
-+  return 0;
-+}
-+
-+int ne_xml_dispatch_request(ne_request *req, ne_xml_parser *parser)
-+{
-+  NE_DEBUG(NE_DBG_XML, "XML: stub ne_xml_dispatch_request() in use\n");
-+  return 0;
-+}
-+
-diff -urpN gnome-vfs-2.14.2/modules/libhttp.map gnome-vfs-2.14.2.az/modules/libhttp.map
---- gnome-vfs-2.14.2/modules/libhttp.map	1970-01-01 02:00:00.000000000 +0200
-+++ gnome-vfs-2.14.2.az/modules/libhttp.map	2006-07-22 15:05:30.000000000 +0200
-@@ -0,0 +1,6 @@
-+{
-+  local:
-+    # Neon symbols should not be global
-+    ne_*;
-+};
-+
-diff -urpN gnome-vfs-2.14.2/modules/Makefile.am gnome-vfs-2.14.2.az/modules/Makefile.am
---- gnome-vfs-2.14.2/modules/Makefile.am	2005-12-11 01:50:19.000000000 +0200
-+++ gnome-vfs-2.14.2.az/modules/Makefile.am	2006-07-22 15:05:30.000000000 +0200
-@@ -44,7 +44,8 @@ EXTRA_DIST =					\
- 	inotify-path.h				\
- 	inotify-path.c				\
- 	local_inotify.h				\
--	local_inotify_syscalls.h
-+	local_inotify_syscalls.h		\
-+	libhttp.map
- 
- ###  Module setup
- if HAVE_CDDA
-@@ -230,6 +231,10 @@ libhttp_la_SOURCES =			\
- 	$(NULL)
- 
- libhttp_la_LDFLAGS = $(module_flags)
-+if USE_HTTP_NEON
-+libhttp_la_LDFLAGS +=			\
-+        -Wl,--version-script,$(srcdir)/libhttp.map
-+endif
- libhttp_la_LIBADD  = $(HTTP_LIBS)
- 
- libtar_la_SOURCES = tar-method.c tarpet.h 
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff
deleted file mode 100644
index 1bda6cdc1d4d..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur gnome-vfs-2.16.3.ori/libgnomevfs/gnome-vfs-mime-handlers.c gnome-vfs-2.16.3/libgnomevfs/gnome-vfs-mime-handlers.c
---- gnome-vfs-2.16.3.ori/libgnomevfs/gnome-vfs-mime-handlers.c	2006-11-20 10:44:13.000000000 +0300
-+++ gnome-vfs-2.16.3/libgnomevfs/gnome-vfs-mime-handlers.c	2006-12-25 16:44:11.000000000 +0300
-@@ -1423,6 +1423,12 @@
- 	app->priv->path = g_key_file_get_string (key_file, DESKTOP_ENTRY_GROUP,
- 						 "Path", NULL);
- 
-+	/* 'Path=' .desktop item is not working. bugzilla.gnome.org/389273 */
-+	if (app->priv->path != NULL && *app->priv->path == 0) {
-+		g_free (app->priv->path);
-+		app->priv->path = NULL;
-+	}
-+
- 	app->requires_terminal = g_key_file_get_boolean
- 			(key_file, DESKTOP_ENTRY_GROUP, "Terminal", &err);
- 	if (err) {
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-fbsd.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-fbsd.patch
deleted file mode 100644
index 6bb4cdc3a189..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-fbsd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-vfs-2.16.3.orig/libgnomevfs/xdgmime.h gnome-vfs-2.16.3/libgnomevfs/xdgmime.h
---- gnome-vfs-2.16.3.orig/libgnomevfs/xdgmime.h	2006-09-13 05:13:31.000000000 -0400
-+++ gnome-vfs-2.16.3/libgnomevfs/xdgmime.h	2007-02-09 13:04:25.000000000 -0500
-@@ -52,11 +52,14 @@ typedef void (*XdgMimeDestroy)  (void *u
- #define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name)
- #define xdg_mime_is_valid_mime_type           XDG_ENTRY(is_valid_mime_type)
- #define xdg_mime_mime_type_equal              XDG_ENTRY(mime_type_equal)
-+#define _xdg_mime_mime_type_equal             XDG_ENTRY(mime_type_equal_p)
- #define xdg_mime_media_type_equal             XDG_ENTRY(media_type_equal)
- #define xdg_mime_mime_type_subclass           XDG_ENTRY(mime_type_subclass)
-+#define _xdg_mime_mime_type_subclass          XDG_ENTRY(mime_type_subclass_p)
- #define xdg_mime_get_mime_parents             XDG_ENTRY(get_mime_parents)
- #define xdg_mime_list_mime_parents            XDG_ENTRY(list_mime_parents)
- #define xdg_mime_unalias_mime_type            XDG_ENTRY(unalias_mime_type)
-+#define _xdg_mime_unalias_mime_type           XDG_ENTRY(unalias_mime_type_p)
- #define xdg_mime_get_max_buffer_extents       XDG_ENTRY(get_max_buffer_extents)
- #define xdg_mime_shutdown                     XDG_ENTRY(shutdown)
- #define xdg_mime_dump                         XDG_ENTRY(dump)
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-vfs-2.16.3.orig/libgnomevfs/xdgmimecache.h gnome-vfs-2.16.3/libgnomevfs/xdgmimecache.h
---- gnome-vfs-2.16.3.orig/libgnomevfs/xdgmimecache.h	2006-01-11 06:47:29.000000000 -0500
-+++ gnome-vfs-2.16.3/libgnomevfs/xdgmimecache.h	2007-02-09 13:04:25.000000000 -0500
-@@ -32,9 +32,19 @@
- typedef struct _XdgMimeCache XdgMimeCache;
- 
- #ifdef XDG_PREFIX
--#define _xdg_mime_cache_new_from_file        XDG_ENTRY(cache_new_from_file)
--#define _xdg_mime_cache_ref                  XDG_ENTRY(cache_ref)
--#define _xdg_mime_cache_unref                XDG_ENTRY(cache_unref)
-+#define _xdg_mime_cache_new_from_file                XDG_ENTRY(cache_new_from_file)
-+#define _xdg_mime_cache_ref                          XDG_ENTRY(cache_ref)
-+#define _xdg_mime_cache_unref                        XDG_ENTRY(cache_unref)
-+#define _xdg_mime_cache_get_mime_type_for_data       XDG_ENTRY(cache_get_mime_type_for_data)
-+#define _xdg_mime_cache_get_mime_type_for_file       XDG_ENTRY(cache_get_mime_type_for_file)
-+#define _xdg_mime_cache_get_mime_type_from_file_name XDG_ENTRY(cache_get_mime_type_from_file_name)
-+#define _xdg_mime_cache_is_valid_mime_type           XDG_ENTRY(cache_is_valid_mime_type)
-+#define _xdg_mime_cache_mime_type_equal              XDG_ENTRY(cache_mime_type_equal)
-+#define _xdg_mime_cache_media_type_equal             XDG_ENTRY(cache_media_type_equal)
-+#define _xdg_mime_cache_mime_type_subclass           XDG_ENTRY(cache_mime_type_subclass)
-+#define _xdg_mime_cache_list_mime_parents            XDG_ENTRY(cache_list_mime_parents)
-+#define _xdg_mime_cache_unalias_mime_type            XDG_ENTRY(cache_unalias_mime_type)
-+#define _xdg_mime_cache_get_max_buffer_extents       XDG_ENTRY(cache_get_max_buffer_extents)
- #endif
- 
- extern XdgMimeCache **_caches;
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-vfs-2.16.3.orig/modules/file-method.c gnome-vfs-2.16.3/modules/file-method.c
---- gnome-vfs-2.16.3.orig/modules/file-method.c	2006-10-17 05:50:30.000000000 -0400
-+++ gnome-vfs-2.16.3/modules/file-method.c	2007-02-09 13:04:19.000000000 -0500
-@@ -75,6 +75,9 @@
- #if HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #elif HAVE_SYS_MOUNT_H
-+#if HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/mount.h>
- #endif
- 
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-home_dir_fakeroot.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-home_dir_fakeroot.patch
new file mode 100644
index 000000000000..65345944d601
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-home_dir_fakeroot.patch
@@ -0,0 +1,160 @@
+Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-application-registry.c
+===================================================================
+--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-application-registry.c	2007-01-03 07:50:44.000000000 +0100
++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-application-registry.c	2007-10-11 10:13:16.429551115 +0200
+@@ -965,7 +965,7 @@
+ 						       NULL);
+ 	gnome_registry_dir.system_dir = TRUE;
+ 	
+-	user_registry_dir.dirname = g_build_filename (g_get_home_dir(),
++	user_registry_dir.dirname = g_build_filename (gnome_vfs_get_home_dir(),
+ 						      ".gnome",
+ 						      "application-info",
+ 						      NULL);
+Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-init.c
+===================================================================
+--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-init.c	2007-03-05 10:05:05.000000000 +0100
++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-init.c	2007-10-11 10:13:16.429551115 +0200
+@@ -59,29 +59,6 @@
+ 
+ static GPrivate * private_is_primary_thread;
+ 
+-static gboolean
+-ensure_dot_gnome_exists (void)
+-{
+-	gboolean retval = TRUE;
+-	gchar *dirname;
+-
+-	dirname = g_build_filename (g_get_home_dir (), ".gnome2", NULL);
+-
+-	if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) {
+-		if (g_mkdir (dirname, S_IRWXU) != 0) {
+-			g_warning ("Unable to create ~/.gnome2 directory: %s",
+-				   g_strerror (errno));
+-			retval = FALSE;
+-		}
+-	} else if (!g_file_test (dirname, G_FILE_TEST_IS_DIR)) {
+-		g_warning ("Error: ~/.gnome2 must be a directory.");
+-		retval = FALSE;
+-	}
+-
+-	g_free (dirname);
+-	return retval;
+-}
+-
+ static void
+ gnome_vfs_thread_init (void)
+ {
+@@ -112,7 +89,8 @@
+ 	char *bogus_argv[2] = { "dummy", NULL };
+ 	*/
+ 	
+-	if (!ensure_dot_gnome_exists ()) {
++	/* The first call also checks that ~/.gnome2 is writable. */
++	if (!gnome_vfs_get_home_dir ()) {
+ 		return FALSE;
+ 	}
+ 
+Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.c
+===================================================================
+--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-private-utils.c	2007-01-03 07:50:44.000000000 +0100
++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.c	2007-10-11 10:14:48.814815851 +0200
+@@ -1086,3 +1086,54 @@
+ }
+ #endif
+ 
++static gboolean
++ensure_dot_gnome_exists (gchar *home_dir)
++{
++	gboolean retval = TRUE;
++	gchar *dirname;
++
++	dirname = g_build_filename (home_dir, ".gnome2", NULL);
++
++	if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) {
++		if (g_mkdir (dirname, S_IRWXU) != 0) {
++			g_warning ("Unable to create ~/.gnome2 directory: %s",
++				   g_strerror (errno));
++			retval = FALSE;
++		}
++	} else if (!g_file_test (dirname, G_FILE_TEST_IS_DIR)) {
++		g_warning ("Error: ~/.gnome2 must be a directory.");
++		retval = FALSE;
++	}
++
++	g_free (dirname);
++	return retval;
++}
++
++/**
++ * gnome_vfs_get_home_dir:
++ *
++ * If ~/.gnome2 is writable, return the home directory
++ * Otherwise, return the contents of the HOME environment variable
++ *
++ * Return value: home directory if successful, NULL otherwise.
++ * Do not free the value returned.
++ */
++const gchar *
++gnome_vfs_get_home_dir (void)
++{
++	static gchar *home = NULL;
++
++	if (home == NULL) {
++		gchar *tmp = g_get_home_dir ();
++		if (ensure_dot_gnome_exists (tmp)) {
++			home = g_strdup (tmp);
++		} else {
++			gchar *tmp2 = g_getenv ("HOME");
++			if (!g_str_equal (tmp, tmp2) && ensure_dot_gnome_exists (tmp2)) {
++				home = g_strdup (tmp2);
++			}
++		}
++	}
++
++	return home;
++}
+Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.h
+===================================================================
+--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-private-utils.h	2007-01-03 07:50:44.000000000 +0100
++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.h	2007-10-11 10:13:16.433551342 +0200
+@@ -124,6 +124,8 @@
+ 
+ #endif
+ 
++const gchar   *gnome_vfs_get_home_dir                     (void);
++
+ G_END_DECLS
+ 
+ #endif /* _GNOME_VFS_PRIVATE_UTILS_H */
+Index: gnome-vfs-2.20.0/modules/file-method.c
+===================================================================
+--- gnome-vfs-2.20.0.orig/modules/file-method.c	2007-10-11 10:13:16.345546327 +0200
++++ gnome-vfs-2.20.0/modules/file-method.c	2007-10-11 10:13:16.433551342 +0200
+@@ -1536,7 +1536,7 @@
+ 	GList *p;
+ 	char *buffer, *escaped_path, *escaped_mount_point;
+ 
+-	cache_file_parent = append_to_path (g_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
++	cache_file_parent = append_to_path (gnome_vfs_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
+ 	cache_file_path = append_to_path (cache_file_parent, TRASH_ENTRY_CACHE_NAME);
+ 
+ 	if (mkdir_recursive (cache_file_parent, 0777) != 0) {
+@@ -1675,7 +1675,7 @@
+ 	cached_trash_directories = NULL;
+ 
+ 	/* read in the entries from disk */
+-	cache_file_path = g_build_filename (g_get_home_dir (),
++	cache_file_path = g_build_filename (gnome_vfs_get_home_dir (),
+ 					    TRASH_ENTRY_CACHE_PARENT,
+ 					    TRASH_ENTRY_CACHE_NAME,
+ 					    NULL);
+@@ -1947,7 +1947,7 @@
+ 		return GNOME_VFS_ERROR_INVALID_URI;
+ 
+ 	/* We will need the URI and the stat structure for the home directory. */
+-	home_directory = g_get_home_dir ();
++	home_directory = gnome_vfs_get_home_dir ();
+ 
+ 	if (gnome_vfs_context_check_cancellation (context)) {
+ 		g_free (full_name_near);