r12434 - in /desktop/unstable/gnome-vfs2/debian: changelog patches/24_gnome_vfs_home_dir.patch patches/series
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Fri Sep 7 13:44:35 UTC 2007
Author: slomo
Date: Fri Sep 7 13:44:34 2007
New Revision: 12434
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12434
Log:
version intact (Closes: #439097).
* debian/patches/24_gnome_vfs_home_dir.patch:
+ Add a new environment variable GNOME_VFS_HOME_DIR to specify the home
directory that GnomeVFS should use. Currently it only uses the value
from g_get_home_dir() which can be changed easily.
Setting this environment variable to a writable directory is necessary
to use GnomeVFS in the buildd chroots.
Added:
desktop/unstable/gnome-vfs2/debian/patches/24_gnome_vfs_home_dir.patch
Modified:
desktop/unstable/gnome-vfs2/debian/changelog
desktop/unstable/gnome-vfs2/debian/patches/series
Modified: desktop/unstable/gnome-vfs2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/changelog?rev=12434&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/changelog (original)
+++ desktop/unstable/gnome-vfs2/debian/changelog Fri Sep 7 13:44:34 2007
@@ -1,9 +1,18 @@
gnome-vfs2 (1:2.18.1-4) UNRELEASED; urgency=low
+ [ Loic Minier ]
* Build-dep on linux-libc-dev instead of linux-kernel-headers; keep the
- version intact.
-
- -- Loic Minier <lool at dooz.org> Sun, 15 Jul 2007 00:11:40 +0200
+ version intact (Closes: #439097).
+
+ [ Sebastian Dröge ]
+ * debian/patches/24_gnome_vfs_home_dir.patch:
+ + Add a new environment variable GNOME_VFS_HOME_DIR to specify the home
+ directory that GnomeVFS should use. Currently it only uses the value
+ from g_get_home_dir() which can be changed easily.
+ Setting this environment variable to a writable directory is necessary
+ to use GnomeVFS in the buildd chroots.
+
+ -- Sebastian Dröge <slomo at debian.org> Fri, 07 Sep 2007 15:10:37 +0200
gnome-vfs2 (1:2.18.1-3) unstable; urgency=low
Added: desktop/unstable/gnome-vfs2/debian/patches/24_gnome_vfs_home_dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/24_gnome_vfs_home_dir.patch?rev=12434&op=file
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/24_gnome_vfs_home_dir.patch (added)
+++ desktop/unstable/gnome-vfs2/debian/patches/24_gnome_vfs_home_dir.patch Fri Sep 7 13:44:34 2007
@@ -1,0 +1,232 @@
+diff -Naur gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-application-registry.c gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-application-registry.c
+--- gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-application-registry.c 2007-04-02 16:16:47.000000000 +0200
++++ gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-application-registry.c 2007-09-07 14:56:12.000000000 +0200
+@@ -944,6 +944,8 @@
+ static void
+ gnome_vfs_application_registry_init (void)
+ {
++ char *home_dir;
++
+ if (gnome_vfs_application_registry_initialized)
+ return;
+
+@@ -964,8 +966,12 @@
+ "application-registry",
+ NULL);
+ gnome_registry_dir.system_dir = TRUE;
++
++ home_dir = getenv ("GNOME_VFS_HOME_DIR");
++ if (home_dir == NULL)
++ home_dir = g_get_home_dir ();
+
+- user_registry_dir.dirname = g_build_filename (g_get_home_dir(),
++ user_registry_dir.dirname = g_build_filename (home_dir,
+ ".gnome",
+ "application-info",
+ NULL);
+diff -Naur gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-cancellable-ops.c gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-cancellable-ops.c
+--- gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-cancellable-ops.c 2007-08-21 11:26:49.000000000 +0200
++++ gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-cancellable-ops.c 2007-09-07 14:56:44.000000000 +0200
+@@ -298,8 +298,13 @@
+ gnome_vfs_uri_ref (near_uri);
+ } else {
+ char *text_uri;
++ char *home_dir;
+
+- text_uri = gnome_vfs_get_uri_from_local_path (g_get_home_dir ());
++ home_dir = getenv ("GNOME_VFS_HOME_DIR");
++ if (home_dir == NULL)
++ home_dir = g_get_home_dir ();
++
++ text_uri = gnome_vfs_get_uri_from_local_path (home_dir);
+ g_assert (text_uri != NULL);
+ /* assume file: method and the home directory */
+ near_uri = gnome_vfs_uri_new (text_uri);
+diff -Naur gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-configuration.c gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-configuration.c
+--- gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-configuration.c 2007-04-02 16:16:48.000000000 +0200
++++ gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-configuration.c 2007-09-07 14:46:49.000000000 +0200
+@@ -507,7 +507,9 @@
+ install_path_list (environment_path);
+ }
+
+- home_dir = g_get_home_dir ();
++ home_dir = getenv ("GNOME_VFS_HOME_DIR");
++ if (home_dir == NULL)
++ home_dir = g_get_home_dir ();
+ if (home_dir != NULL) {
+ home_config = g_build_filename (home_dir,
+ ".gnome2", "vfs", "modules",
+diff -Naur gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-init.c gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-init.c
+--- gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-init.c 2007-04-02 16:16:48.000000000 +0200
++++ gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-init.c 2007-09-07 14:57:47.000000000 +0200
+@@ -64,8 +64,13 @@
+ {
+ gboolean retval = TRUE;
+ gchar *dirname;
++ gchar *home_dir;
+
+- dirname = g_build_filename (g_get_home_dir (), ".gnome2", NULL);
++ home_dir = getenv ("GNOME_VFS_HOME_DIR");
++ if (home_dir == NULL)
++ home_dir = g_get_home_dir ();
++
++ dirname = g_build_filename (home_dir, ".gnome2", NULL);
+
+ if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) {
+ if (g_mkdir (dirname, S_IRWXU) != 0) {
+diff -Naur gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-utils.c gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-utils.c
+--- gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-utils.c 2007-04-02 16:16:48.000000000 +0200
++++ gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-utils.c 2007-09-07 14:59:01.000000000 +0200
+@@ -417,6 +417,7 @@
+ #ifndef G_OS_WIN32
+ char *slash_after_user_name, *user_name;
+ struct passwd *passwd_file_entry;
++ char *home_dir;
+
+ g_return_val_if_fail (path != NULL, NULL);
+
+@@ -424,8 +425,12 @@
+ return g_strdup (path);
+ }
+
++ home_dir = getenv ("GNOME_VFS_HOME_DIR");
++ if (home_dir == NULL)
++ home_dir = g_get_home_dir ();
++
+ if (path[1] == '/' || path[1] == '\0') {
+- return g_strconcat (g_get_home_dir (), &path[1], NULL);
++ return g_strconcat (home_dir, &path[1], NULL);
+ }
+
+ slash_after_user_name = strchr (&path[1], '/');
+@@ -1538,7 +1543,13 @@
+
+ if (uri == NULL &&
+ dirs & GNOME_VFS_MAKE_URI_DIR_HOMEDIR) {
+- path = g_build_filename (g_get_home_dir (), location, NULL);
++ char *home_dir;
++
++ home_dir = getenv ("GNOME_VFS_HOME_DIR");
++ if (home_dir == NULL)
++ home_dir = g_get_home_dir ();
++
++ path = g_build_filename (home_dir, location, NULL);
+
+ if (g_file_test (path, G_FILE_TEST_EXISTS)) {
+ uri = gnome_vfs_make_uri_from_input (path);
+diff -Naur gnome-vfs2-2.19.91.old/modules/computer-method.c gnome-vfs2-2.19.91/modules/computer-method.c
+--- gnome-vfs2-2.19.91.old/modules/computer-method.c 2007-04-02 16:16:44.000000000 +0200
++++ gnome-vfs2-2.19.91/modules/computer-method.c 2007-09-07 14:59:16.000000000 +0200
+@@ -550,8 +550,13 @@
+ {
+ char *data;
+ char *uri;
++ char *home_dir;
+
+- uri = gnome_vfs_get_uri_from_local_path (g_get_home_dir ());
++ home_dir = getenv ("GNOME_VFS_HOME_DIR");
++ if (home_dir == NULL)
++ home_dir = g_get_home_dir ();
++
++ uri = gnome_vfs_get_uri_from_local_path (home_dir);
+ data = g_strdup_printf ("[Desktop Entry]\n"
+ "Encoding=UTF-8\n"
+ "Name=%s\n"
+diff -Naur gnome-vfs2-2.19.91.old/modules/file-method.c gnome-vfs2-2.19.91/modules/file-method.c
+--- gnome-vfs2-2.19.91.old/modules/file-method.c 2007-04-02 16:16:44.000000000 +0200
++++ gnome-vfs2-2.19.91/modules/file-method.c 2007-09-07 15:00:31.000000000 +0200
+@@ -1529,8 +1529,13 @@
+ char *cache_file_parent, *cache_file_path;
+ GList *p;
+ char *buffer, *escaped_path, *escaped_mount_point;
++ char *home_dir;
++
++ home_dir = getenv ("GNOME_VFS_HOME_DIR");
++ if (home_dir == NULL)
++ home_dir = g_get_home_dir ();
+
+- cache_file_parent = append_to_path (g_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
++ cache_file_parent = append_to_path (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) {
+@@ -1661,6 +1666,7 @@
+ char *mount_point, *trash_path;
+ struct stat stat_buffer;
+ gboolean removed_item;
++ char *home_dir;
+
+ /* empty the old locally cached entries */
+ g_list_foreach (cached_trash_directories,
+@@ -1669,7 +1675,11 @@
+ cached_trash_directories = NULL;
+
+ /* read in the entries from disk */
+- cache_file_path = g_build_filename (g_get_home_dir (),
++ home_dir = getenv ("GNOME_VFS_HOME_DIR");
++ if (home_dir == NULL)
++ home_dir = g_get_home_dir ();
++
++ cache_file_path = g_build_filename (home_dir,
+ TRASH_ENTRY_CACHE_PARENT,
+ TRASH_ENTRY_CACHE_NAME,
+ NULL);
+@@ -1941,7 +1951,9 @@
+ 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 = getenv ("GNOME_VFS_HOME_DIR");
++ if (home_directory == NULL)
++ home_directory = g_get_home_dir ();
+
+ if (gnome_vfs_context_check_cancellation (context)) {
+ g_free (full_name_near);
+diff -Naur gnome-vfs2-2.19.91.old/modules/smb-method.c gnome-vfs2-2.19.91/modules/smb-method.c
+--- gnome-vfs2-2.19.91.old/modules/smb-method.c 2007-08-21 11:27:08.000000000 +0200
++++ gnome-vfs2-2.19.91/modules/smb-method.c 2007-09-07 15:00:46.000000000 +0200
+@@ -659,6 +659,7 @@
+ GConfClient *gclient;
+ gchar *workgroup;
+ struct stat statbuf;
++ gchar *home_dir;
+
+ LOCK_SMB();
+
+@@ -666,7 +667,11 @@
+ * default settings, but this breaks a lot of smb.conf
+ * configurations, so we remove this again. If you really
+ * need an empty smb.conf, put a newline in it */
+- path = g_build_filename (G_DIR_SEPARATOR_S, g_get_home_dir (),
++ home_dir = getenv ("GNOME_VFS_HOME_DIR");
++ if (home_dir == NULL)
++ home_dir = g_get_home_dir ();
++
++ path = g_build_filename (G_DIR_SEPARATOR_S, home_dir,
+ ".smb", "smb.conf", NULL);
+
+ if (stat (path, &statbuf) == 0) {
+diff -Naur gnome-vfs2-2.19.91.old/test/test-async-cancel.c gnome-vfs2-2.19.91/test/test-async-cancel.c
+--- gnome-vfs2-2.19.91.old/test/test-async-cancel.c 2007-04-02 16:16:53.000000000 +0200
++++ gnome-vfs2-2.19.91/test/test-async-cancel.c 2007-09-07 15:01:16.000000000 +0200
+@@ -644,6 +644,11 @@
+ {
+ GnomeVFSAsyncHandle *handle;
+ GList *vfs_uri_as_list = NULL;
++ gchar *home_dir;
++
++ home_dir = getenv ("GNOME_VFS_HOME_DIR");
++ if (home_dir == NULL)
++ home_dir = g_get_home_dir ();
+
+
+ #ifndef G_OS_WIN32
+@@ -651,7 +656,7 @@
+ #else
+ vfs_uri_as_list = g_list_append (vfs_uri_as_list,
+ gnome_vfs_uri_new (g_strconcat ("file://",
+- g_get_home_dir (),
++ home_dir,
+ NULL)));
+ #endif
+ vfs_uri_as_list = g_list_append (vfs_uri_as_list, gnome_vfs_uri_new ("file:///ace_of_spades"));
Modified: desktop/unstable/gnome-vfs2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/series?rev=12434&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/series (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/series Fri Sep 7 13:44:34 2007
@@ -13,5 +13,6 @@
20_dont_register_keys_for_gaim.patch
22_ignore_inaccessible_volumes.patch
23_improve_volume_labels.patch
+24_gnome_vfs_home_dir.patch
30_nfs4.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list