Changeset 7256 for pkg/raul/main/gnome-vfs

Timestamp:

01/28/11 04:12:43 (2 years ago)

Author:

alanbach-guest

Message:

• Updated 24_home_dir_fakeroot

File:

• pkg/raul/main/gnome-vfs/trunk/debian/patches/24_home_dir_fakeroot.patch (modified) (8 diffs)

pkg/raul/main/gnome-vfs/trunk/debian/patches/24_home_dir_fakeroot.patch

@@ -1 @@
-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);
@@ -12 +12 @@
                                                       "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;
@@ -24 +24 @@
 -{
 -       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);
@@ -46 +54 @@
  gnome_vfs_thread_init (void)
  {
-@@ -110,7 +87,8 @@
+@@ -118,7 +87,8 @@
         char *bogus_argv[2] = { "dummy", NULL };
         */
@@ -56 +64 @@
         }
  
-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
@@ -68 +76 @@
 +{
 +       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);
@@ -115 +131 @@
 +       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 @@
  
@@ -128 +144 @@
  
  #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;