r26913 - in /desktop/unstable/gnome-vfs/debian: changelog patches/24_home_dir_fakeroot.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed Mar 16 14:02:31 UTC 2011
Author: biebl
Date: Wed Mar 16 14:02:28 2011
New Revision: 26913
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26913
Log:
Refresh debian/patches/24_home_dir_fakeroot.patch.
Modified:
desktop/unstable/gnome-vfs/debian/changelog
desktop/unstable/gnome-vfs/debian/patches/24_home_dir_fakeroot.patch
Modified: desktop/unstable/gnome-vfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/changelog?rev=26913&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/changelog [utf-8] Wed Mar 16 14:02:28 2011
@@ -13,6 +13,7 @@
- Remove --as-needed from debian/rules.
- Drop debian/patches/90_relibtoolize.patch and
debian/patches/99_ltmain_as-needed.patch.
+ * Refresh debian/patches/24_home_dir_fakeroot.patch.
-- Michael Biebl <biebl at debian.org> Wed, 16 Mar 2011 13:08:05 +0100
Modified: desktop/unstable/gnome-vfs/debian/patches/24_home_dir_fakeroot.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/24_home_dir_fakeroot.patch?rev=26913&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/24_home_dir_fakeroot.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/24_home_dir_fakeroot.patch [utf-8] Wed Mar 16 14:02:28 2011
@@ -1,7 +1,7 @@
-Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-application-registry.c
+Index: gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-application-registry.c
===================================================================
---- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-application-registry.c 2009-04-20 12:46:46.000000000 +0200
-+++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-application-registry.c 2010-02-06 11:55:50.725285502 +0100
+--- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-application-registry.c 2010-11-25 15:46:59.763441002 +1100
++++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-application-registry.c 2010-11-25 15:47:10.953441002 +1100
@@ -965,7 +965,7 @@
NULL);
gnome_registry_dir.system_dir = TRUE;
@@ -11,11 +11,11 @@
".gnome",
"application-info",
NULL);
-Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-init.c
+Index: gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-init.c
===================================================================
---- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-init.c 2009-04-20 12:46:46.000000000 +0200
-+++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-init.c 2010-02-06 11:55:50.725285502 +0100
-@@ -57,29 +57,6 @@
+--- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-init.c 2010-11-25 15:46:59.793441002 +1100
++++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-init.c 2010-11-25 15:47:34.113441001 +1100
+@@ -57,37 +57,6 @@
static GPrivate * private_is_primary_thread;
@@ -23,7 +23,15 @@
-ensure_dot_gnome_exists (void)
-{
- gboolean retval = TRUE;
+- gboolean create_dirs;
- gchar *dirname;
+-
+- /* If the user does not have a writable HOME directory, then
+- avoid creating the directory. */
+- create_dirs = (g_access (g_get_home_dir(), W_OK) == 0);
+-
+- if (create_dirs != TRUE)
+- return TRUE;
-
- dirname = g_build_filename (g_get_home_dir (), ".gnome2", NULL);
-
@@ -45,7 +53,7 @@
static void
gnome_vfs_thread_init (void)
{
-@@ -110,7 +87,8 @@
+@@ -118,7 +87,8 @@
char *bogus_argv[2] = { "dummy", NULL };
*/
@@ -55,11 +63,11 @@
return FALSE;
}
-Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-private-utils.c
+Index: gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-private-utils.c
===================================================================
---- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-private-utils.c 2009-04-20 12:46:46.000000000 +0200
-+++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-private-utils.c 2010-02-06 11:55:50.725285502 +0100
-@@ -1085,3 +1085,54 @@
+--- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-private-utils.c 2010-11-25 15:46:59.783441002 +1100
++++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-private-utils.c 2010-11-25 15:47:42.053441001 +1100
+@@ -1085,3 +1085,62 @@
}
#endif
@@ -67,7 +75,15 @@
+ensure_dot_gnome_exists (gchar *home_dir)
+{
+ gboolean retval = TRUE;
++ gboolean create_dirs;
+ gchar *dirname;
++
++ /* If the user does not have a writable HOME directory, then
++ avoid creating the directory. */
++ create_dirs = (g_access (home_dir, W_OK) == 0);
++
++ if (create_dirs != TRUE)
++ return TRUE;
+
+ dirname = g_build_filename (home_dir, ".gnome2", NULL);
+
@@ -114,10 +130,10 @@
+
+ return home;
+}
-Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-private-utils.h
+Index: gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-private-utils.h
===================================================================
---- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-private-utils.h 2009-04-20 12:46:46.000000000 +0200
-+++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-private-utils.h 2010-02-06 11:55:50.729281262 +0100
+--- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-private-utils.h 2010-11-25 15:46:59.773441002 +1100
++++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-private-utils.h 2010-11-25 15:47:10.953441002 +1100
@@ -124,6 +124,8 @@
#endif
@@ -127,10 +143,10 @@
G_END_DECLS
#endif /* _GNOME_VFS_PRIVATE_UTILS_H */
-Index: gnome-vfs-2.24.2/modules/file-method.c
+Index: gnome-vfs-2.24.4/modules/file-method.c
===================================================================
---- gnome-vfs-2.24.2.orig/modules/file-method.c 2010-02-06 11:55:49.537282516 +0100
-+++ gnome-vfs-2.24.2/modules/file-method.c 2010-02-06 11:55:50.729281262 +0100
+--- gnome-vfs-2.24.4.orig/modules/file-method.c 2010-11-25 15:46:59.803441002 +1100
++++ gnome-vfs-2.24.4/modules/file-method.c 2010-11-25 15:47:10.953441002 +1100
@@ -1537,7 +1537,7 @@
GList *p;
char *buffer, *escaped_path, *escaped_mount_point;
More information about the pkg-gnome-commits
mailing list