r36568 - in /desktop/experimental/glib2.0/debian: changelog patches/04_homedir_env.patch patches/07_disable_tests_on_slow_archs.patch patches/08_disable_gapplication_basic_test.patch patches/90_gio-modules-multiarch-compat.patch

laney at users.alioth.debian.org laney at users.alioth.debian.org
Fri Jan 11 12:13:58 UTC 2013 

Author: laney
Date: Fri Jan 11 12:13:57 2013
New Revision: 36568

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36568
Log:
Refresh patches and slightly rework debian/patches/04_homedir_env.patch:
g_get_home_dir() now respects the HOME environment variable but we'll keep
G_HOME for now as packages in Debian rely on it.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch
    desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
    desktop/experimental/glib2.0/debian/patches/08_disable_gapplication_basic_test.patch
    desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=36568&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Fri Jan 11 12:13:57 2013
@@ -1,4 +1,4 @@
-glib2.0 (2.35.3-1) unstable; urgency=low
+glib2.0 (2.35.3-1) UNRELEASED; urgency=low
 
   [ Matthias Klose ]
   * Configure cross builds with --disable-modular-tests --disable-gtk-doc.
@@ -12,6 +12,9 @@
       After removing /usr/share/glib-2.0/schemas/gschemas.compiled on purge,
       run dpkg-trigger explicitly, so in case libglib2.0-0 is installed for
       other architectures, the cache file is re-created. (Closes: #696389)
+  * Refresh patches and slightly rework debian/patches/04_homedir_env.patch:
+    g_get_home_dir() now respects the HOME environment variable but we'll keep
+    G_HOME for now as packages in Debian rely on it.
 
  -- Iain Lane <laney at debian.org>  Thu, 10 Jan 2013 13:00:54 +0000
 

Modified: desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch?rev=36568&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch [utf-8] Fri Jan 11 12:13:57 2013
@@ -8,7 +8,7 @@
 ===================================================================
 --- a/docs/reference/glib/running.xml
 +++ b/docs/reference/glib/running.xml
-@@ -244,6 +244,22 @@
+@@ -244,6 +244,24 @@
    </para>
  </formalpara>
  
@@ -16,15 +16,17 @@
 +  <title><envar>G_HOME</envar></title>
 +
 +  <para>
-+    For various reasons, GLib applications ignore the <envar>HOME</envar>
-+    environment variable on Unix systems and will use the user directory
-+    as specified by the <filename>passwd</filename> entry, which is more
-+    reliable.
++    Historically, GLib applications ignored the <envar>HOME</envar>
++    environment variable on Unix systems, instead using the user directory
++    as specified by the <filename>passwd</filename> entry. As of GLib 2.35.3,
++    this is no longer true: <envar>HOME</envar> is respected.
 +  </para>
 +  <para>
 +    The <envar>G_HOME</envar> environment variable will override any
-+    other setting for the home directory. It is not meant for daily usage,
-+    but it is useful in testing or building environments.
++    other setting for the home directory. It is not meant for daily usage, but
++    it is useful in testing or building environments. As <envar>HOME</envar> is
++    now supported by GLib, <envar>G_HOME</envar> is deprecated and will be
++    removed in a future release.
 +  </para>
 +</formalpara>
 +
@@ -35,31 +37,32 @@
 ===================================================================
 --- a/glib/gutils.c
 +++ b/glib/gutils.c
-@@ -700,11 +700,14 @@
+@@ -701,8 +701,12 @@
      }
  #endif	/* !G_OS_WIN32 */
-   
+ 
+-  /* We first check HOME and use it if it is set */
+-  g_home_dir = g_strdup (g_getenv ("HOME"));
++  /* Debian specific: Allow G_HOME to override the home directory */
 +  g_home_dir = g_strdup (g_getenv ("G_HOME"));
 +
++  /* If G_HOME isn't set, we check HOME and use it if it is set */
++  if (!g_home_dir)
++      g_home_dir = g_strdup (g_getenv ("HOME"));
+ 
  #ifdef G_OS_WIN32
-   /* We check $HOME first for Win32, though it is a last resort for Unix
-    * where we prefer the results of getpwuid().
-    */
--  g_home_dir = g_strdup (g_getenv ("HOME"));
-+  if (!g_home_dir)
-+    g_home_dir = g_strdup (g_getenv ("HOME"));
- 
-   /* Only believe HOME if it is an absolute path and exists */
-   if (g_home_dir)
-@@ -1000,6 +1003,11 @@
-  *      homedir = g_get_home_dir (<!-- -->);
-  * ]|
+   /* Only believe HOME if it is an absolute path and exists.
+@@ -1000,6 +1004,13 @@
+  *   should either directly check the <envar>HOME</envar> environment
+  *   variable yourself or unset it before calling any functions in GLib.
+  * </para></note>
++ * <note><para>
++ *   When the pre-2.36 behaviour was in effect, Debian provided the
++ *   <envar>G_HOME</envar> environment variable for testing and development
++ *   purposes. This is now unnecessary as <envar>HOME</envar> can be used
++ *   directly, but is retained for compatibility. It is deprecated and will be
++ *   removed in a future release.
++ * </para></note>
   *
-+ * However, to allow changing this value for testing and development
-+ * purposes, the value of the <envar>G_HOME</envar> environment
-+ * variable, if set, will override the <filename>passwd</filename>
-+ * entry.
-+ *
   * Returns: the current user's home directory
   */
- const gchar *

Modified: desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch?rev=36568&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch [utf-8] Fri Jan 11 12:13:57 2013
@@ -2,11 +2,11 @@
 Author: Martin Pitt <martin.pitt at ubuntu.com>
 Forwarded: No
 
-Index: glib2.0-2.33.14/gio/tests/socket.c
+Index: b/gio/tests/socket.c
 ===================================================================
---- glib2.0-2.33.14.orig/gio/tests/socket.c	2012-09-26 08:43:08.193418592 +0200
-+++ glib2.0-2.33.14/gio/tests/socket.c	2012-09-26 14:29:34.842424607 +0200
-@@ -828,7 +828,9 @@
+--- a/gio/tests/socket.c
++++ b/gio/tests/socket.c
+@@ -826,7 +826,9 @@
    g_test_add_func ("/socket/ipv6_v4mapped", test_ipv6_v4mapped);
  #endif
    g_test_add_func ("/socket/close_graceful", test_close_graceful);
@@ -16,11 +16,11 @@
    g_test_add_func ("/socket/address", test_sockaddr);
  #ifdef G_OS_UNIX
    g_test_add_func ("/socket/unix-from-fd", test_unix_from_fd);
-Index: glib2.0-2.33.14/glib/tests/mainloop.c
+Index: b/glib/tests/mainloop.c
 ===================================================================
---- glib2.0-2.33.14.orig/glib/tests/mainloop.c	2012-09-26 08:43:08.193418592 +0200
-+++ glib2.0-2.33.14/glib/tests/mainloop.c	2012-09-26 14:29:54.946425580 +0200
-@@ -684,11 +684,15 @@
+--- a/glib/tests/mainloop.c
++++ b/glib/tests/mainloop.c
+@@ -770,11 +770,15 @@
  
    g_test_add_func ("/maincontext/basic", test_maincontext_basic);
    g_test_add_func ("/mainloop/basic", test_mainloop_basic);
@@ -35,11 +35,11 @@
 +#endif
    g_test_add_func ("/mainloop/swapping_child_sources", test_swapping_child_sources);
    g_test_add_func ("/mainloop/source_time", test_source_time);
- 
-Index: glib2.0-2.33.14/glib/tests/timeout.c
+   g_test_add_func ("/mainloop/overflow", test_mainloop_overflow);
+Index: b/glib/tests/timeout.c
 ===================================================================
---- glib2.0-2.33.14.orig/glib/tests/timeout.c	2012-09-26 08:43:08.193418592 +0200
-+++ glib2.0-2.33.14/glib/tests/timeout.c	2012-09-26 14:29:34.846424607 +0200
+--- a/glib/tests/timeout.c
++++ b/glib/tests/timeout.c
 @@ -102,7 +102,9 @@
    g_test_init (&argc, &argv, NULL);
  
@@ -50,10 +50,10 @@
  
    return g_test_run ();
  }
-Index: glib2.0-2.33.14/gio/tests/gdbus-threading.c
+Index: b/gio/tests/gdbus-threading.c
 ===================================================================
---- glib2.0-2.33.14.orig/gio/tests/gdbus-threading.c	2012-09-26 08:43:08.193418592 +0200
-+++ glib2.0-2.33.14/gio/tests/gdbus-threading.c	2012-09-26 14:29:34.850424607 +0200
+--- a/gio/tests/gdbus-threading.c
++++ b/gio/tests/gdbus-threading.c
 @@ -406,7 +406,9 @@
  
        /* elapsed_msec should be 4000 msec +/- change for overhead/inaccuracy */

Modified: desktop/experimental/glib2.0/debian/patches/08_disable_gapplication_basic_test.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/08_disable_gapplication_basic_test.patch?rev=36568&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/08_disable_gapplication_basic_test.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/08_disable_gapplication_basic_test.patch [utf-8] Fri Jan 11 12:13:57 2013
@@ -8,11 +8,11 @@
  gio/tests/gapplication.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gio/tests/gapplication.c b/gio/tests/gapplication.c
-index 2e0ea9d..f8ba1f2 100644
+Index: b/gio/tests/gapplication.c
+===================================================================
 --- a/gio/tests/gapplication.c
 +++ b/gio/tests/gapplication.c
-@@ -458,7 +458,7 @@ main (int argc, char **argv)
+@@ -514,7 +514,7 @@
    g_test_dbus_unset ();
  
    g_test_add_func ("/gapplication/no-dbus", test_nodbus);
@@ -21,6 +21,3 @@
    g_test_add_func ("/gapplication/no-appid", test_noappid);
  /*  g_test_add_func ("/gapplication/non-unique", test_nonunique); */
    g_test_add_func ("/gapplication/properties", properties);
--- 
-1.7.10.4
-

Modified: desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch?rev=36568&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch [utf-8] Fri Jan 11 12:13:57 2013
@@ -1,8 +1,8 @@
-Index: glib-2.32.2/gio/giomodule.c
+Index: b/gio/giomodule.c
 ===================================================================
---- glib-2.32.2.orig/gio/giomodule.c	2012-04-30 18:24:02.000000000 +0200
-+++ glib-2.32.2/gio/giomodule.c	2012-05-01 17:02:18.503885029 +0200
-@@ -905,6 +905,8 @@
+--- a/gio/giomodule.c
++++ b/gio/giomodule.c
+@@ -915,6 +915,8 @@
  
        /* Then load the compiled in path */
        g_io_modules_scan_all_in_directory_with_scope (GIO_MODULE_DIR, scope);

More information about the pkg-gnome-commits mailing list