r52270 - in /desktop/unstable/glib2.0/debian: changelog patches/series patches/tests-gdatetime-Use-a-real-rather-than-invented-time.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Mar 19 23:10:18 2017
New Revision: 52270

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52270
Log:
debian/patches/tests-gdatetime-Use-a-real-rather-than-invented-time.patch:
Cherry-pick a patch from upstream to fix GDateTime tests when tzdata ≥
2017a is in use. (Closes: #858214)

Added:
    desktop/unstable/glib2.0/debian/patches/tests-gdatetime-Use-a-real-rather-than-invented-time.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/series

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=52270&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog	[utf-8] Sun Mar 19 23:10:18 2017
@@ -1,3 +1,11 @@
+glib2.0 (2.50.3-2) UNRELEASED; urgency=medium
+
+  * debian/patches/tests-gdatetime-Use-a-real-rather-than-invented-time.patch:
+    Cherry-pick a patch from upstream to fix GDateTime tests when tzdata ≥
+    2017a is in use. (Closes: #858214)
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 20 Mar 2017 00:09:59 +0100
+
 glib2.0 (2.50.3-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=52270&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series	[utf-8] Sun Mar 19 23:10:18 2017
@@ -12,3 +12,4 @@
 0001-timer-test-use-volatile-for-locals.patch
 skip-broken-timer-test.patch
 0001-Fix-trashing-on-overlayfs.patch
+tests-gdatetime-Use-a-real-rather-than-invented-time.patch

Added: desktop/unstable/glib2.0/debian/patches/tests-gdatetime-Use-a-real-rather-than-invented-time.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/tests-gdatetime-Use-a-real-rather-than-invented-time.patch?rev=52270&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/tests-gdatetime-Use-a-real-rather-than-invented-time.patch	(added)
+++ desktop/unstable/glib2.0/debian/patches/tests-gdatetime-Use-a-real-rather-than-invented-time.patch	[utf-8] Sun Mar 19 23:10:18 2017
@@ -0,0 +1,53 @@
+From 3abb760e57888e23e2b8371293895d425608416c Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain at orangesquash.org.uk>
+Date: Mon, 13 Mar 2017 16:52:11 +0000
+Subject: [PATCH] tests/gdatetime: Use a real rather than invented timezone
+
+The tzdata maintainers had previously invented abbreviations for
+timezones. As of their 2017a release, the one we were testing ("BRT")
+has been dropped.
+
+Switch to testing PST, which is a real timezone abbreviation.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=779799
+(cherry picked from commit ec02a1875f29ecb8e46c0d8c1403cd00a0b3a9e4)
+---
+ glib/tests/gdatetime.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
+index f6c3cf0d8..2204f9bce 100644
+--- a/glib/tests/gdatetime.c
++++ b/glib/tests/gdatetime.c
+@@ -636,22 +636,22 @@ test_GDateTime_new_full (void)
+   g_date_time_unref (dt);
+ 
+ #ifdef G_OS_UNIX
+-  tz = g_time_zone_new ("America/Recife");
++  tz = g_time_zone_new ("America/Tijuana");
+ #elif defined G_OS_WIN32
+-  tz = g_time_zone_new ("E. South America Standard Time");
++  tz = g_time_zone_new ("Pacific Standard Time");
+ #endif
+-  dt = g_date_time_new (tz, 2010, 5, 24, 8, 4, 0);
++  dt = g_date_time_new (tz, 2010, 11, 24, 8, 4, 0);
+   g_time_zone_unref (tz);
+   g_assert_cmpint (2010, ==, g_date_time_get_year (dt));
+-  g_assert_cmpint (5, ==, g_date_time_get_month (dt));
++  g_assert_cmpint (11, ==, g_date_time_get_month (dt));
+   g_assert_cmpint (24, ==, g_date_time_get_day_of_month (dt));
+   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));
+ #ifdef G_OS_UNIX
+-  g_assert_cmpstr ("BRT", ==, g_date_time_get_timezone_abbreviation (dt));
++  g_assert_cmpstr ("PST", ==, g_date_time_get_timezone_abbreviation (dt));
+ #elif defined G_OS_WIN32
+-  g_assert_cmpstr ("E. South America Standard Time", ==,
++  g_assert_cmpstr ("Pacific Standard Time", ==,
+                     g_date_time_get_timezone_abbreviation (dt));
+ #endif
+   g_assert (!g_date_time_is_daylight_savings (dt));
+-- 
+2.11.0
+