From 7bc5cc2b96188aad7f452309a0f4ae5aeecdf0e4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 8 Jun 2013 18:41:21 +0200 Subject: 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. --- gnu/packages/patches/glib-tests-timezone.patch | 41 -------------------------- 1 file changed, 41 deletions(-) delete mode 100644 gnu/packages/patches/glib-tests-timezone.patch (limited to 'gnu/packages/patches/glib-tests-timezone.patch') diff --git a/gnu/packages/patches/glib-tests-timezone.patch b/gnu/packages/patches/glib-tests-timezone.patch deleted file mode 100644 index 4b335c7ffb..0000000000 --- a/gnu/packages/patches/glib-tests-timezone.patch +++ /dev/null @@ -1,41 +0,0 @@ -Since glibc 2.17 doesn't install timezone data by default (see -http://thread.gmane.org/gmane.comp.lib.glibc.alpha/17516), and since we -don't have that around, shamelessly skip this test. - ---- glib-2.34.3/glib/tests/gdatetime.c 2013-01-16 15:47:57.000000000 +0100 -+++ glib-2.34.3/glib/tests/gdatetime.c 2013-01-16 15:47:58.000000000 +0100 -@@ -186,14 +186,6 @@ test_GDateTime_equal (void) - g_assert (g_date_time_equal (dt1, dt2)); - g_date_time_unref (dt1); - -- /* America/Recife is in UTC-0300 */ -- tz = g_time_zone_new ("America/Recife"); -- dt1 = g_date_time_new (tz, 2010, 5, 24, 8, 0, 0); -- g_time_zone_unref (tz); -- g_assert_cmpint (g_date_time_get_utc_offset (dt1) / G_USEC_PER_SEC, ==, (-3 * 3600)); -- g_assert (g_date_time_equal (dt1, dt2)); -- g_date_time_unref (dt1); -- g_date_time_unref (dt2); - } - - static void -@@ -608,7 +608,6 @@ test_GDateTime_new_full (void) - g_assert_cmpint (8, ==, g_date_time_get_hour (dt)); - g_assert_cmpint (4, ==, g_date_time_get_minute (dt)); - g_assert_cmpint (0, ==, g_date_time_get_second (dt)); -- g_assert_cmpstr ("BRT", ==, g_date_time_get_timezone_abbreviation (dt)); - g_assert (!g_date_time_is_daylight_savings (dt)); - g_date_time_unref (dt); - } -@@ -1354,11 +1354,8 @@ main (gint argc, - g_test_add_func ("/GDateTime/to_timeval", test_GDateTime_to_timeval); - g_test_add_func ("/GDateTime/to_utc", test_GDateTime_to_utc); - g_test_add_func ("/GDateTime/now_utc", test_GDateTime_now_utc); -- g_test_add_func ("/GDateTime/dst", test_GDateTime_dst); - g_test_add_func ("/GDateTime/test_z", test_z); - g_test_add_func ("/GDateTime/test-all-dates", test_all_dates); -- g_test_add_func ("/GTimeZone/find-interval", test_find_interval); -- g_test_add_func ("/GTimeZone/adjust-time", test_adjust_time); - g_test_add_func ("/GTimeZone/no-header", test_no_header); - - return g_test_run (); -- cgit v1.2.3