diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-06-08 18:41:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-06-08 18:41:44 +0200 |
| commit | 7bc5cc2b96188aad7f452309a0f4ae5aeecdf0e4 (patch) | |
| tree | f6cc6d9cc68296490e7a0f48167b69ee817adeaa /gnu/packages/patches/glib-tests-homedir.patch | |
| parent | 0d62efbe5a14804de6093be44c511c51bc6aa50c (diff) | |
| download | guix-patches-7bc5cc2b96188aad7f452309a0f4ae5aeecdf0e4.tar guix-patches-7bc5cc2b96188aad7f452309a0f4ae5aeecdf0e4.tar.gz | |
gnu: glib: Update to 2.37.1.
* gnu/packages/glib.scm (glib): Update to 2.37.1. Add Bash and tzdata
as inputs. Remove `glib-tests-timezone.patch'. Augment `pre-build'
phase to set `TZDIR', `XDG_CACHE_HOME', and to modify makefiles to
honor $(TESTS_ENVIRONMENT).
* gnu/packages/patches/glib-tests-desktop.patch,
gnu/packages/patches/glib-tests-homedir.patch: Update.
* gnu/packages/patches/glib-tests-timezone.patch: Remove.
* Makefile.am (dist_patch_DATA): Update accordingly.
Diffstat (limited to 'gnu/packages/patches/glib-tests-homedir.patch')
| -rw-r--r-- | gnu/packages/patches/glib-tests-homedir.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gnu/packages/patches/glib-tests-homedir.patch b/gnu/packages/patches/glib-tests-homedir.patch index 9232ca5e77..cb9538ef8c 100644 --- a/gnu/packages/patches/glib-tests-homedir.patch +++ b/gnu/packages/patches/glib-tests-homedir.patch @@ -29,21 +29,21 @@ chroot build environment. Thus, disable them. ret = g_test_run(); ---- glib-2.34.3/gio/tests/gdbus-exit-on-close.c 2013-01-16 17:49:25.000000000 +0100 -+++ glib-2.34.3/gio/tests/gdbus-exit-on-close.c 2013-01-16 17:49:30.000000000 +0100 -@@ -206,13 +206,6 @@ main (int argc, - g_type_init (); +--- glib-2.37.1/gio/tests/gdbus-exit-on-close.c 2013-06-07 23:41:34.000000000 +0200 ++++ glib-2.37.1/gio/tests/gdbus-exit-on-close.c 2013-06-07 23:41:40.000000000 +0200 +@@ -211,6 +211,7 @@ main (int argc, + g_test_init (&argc, &argv, NULL); -- for (i = 0; cases[i].name != NULL; i++) -- { -- gchar *name = g_strdup_printf ("/gdbus/exit-on-close/%s", cases[i].name); -- -- g_test_add_data_func (name, &cases[i], test_exit_on_close); -- g_free (name); -- } ++ return g_test_run(); + for (i = 0; cases[i].name != NULL; i++) + { + gchar *name; +@@ -224,5 +225,4 @@ main (int argc, + g_free (name); + } - return g_test_run(); +- return g_test_run(); } --- glib-2.34.3/gio/tests/gdbus-non-socket.c 2013-01-16 18:13:25.000000000 +0100 |