r40896 - in /desktop/experimental/glib2.0/debian: changelog patches/0001-timer-test-use-volatile-for-locals.patch patches/80-skip-timer-test.patch patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Tue Mar 18 10:13:30 2014
New Revision: 40896

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40896
Log:
* New upstream release.
* 0001-timer-test-use-volatile-for-locals.patch: Take patch from bgo #722604
  to workaround gcc's intentional spec violation in the timer tests.
  + Remove debian/patches/80-skip-timer-test.patch accordingly; it should
    now work.

Added:
    desktop/experimental/glib2.0/debian/patches/0001-timer-test-use-volatile-for-locals.patch
Removed:
    desktop/experimental/glib2.0/debian/patches/80-skip-timer-test.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=40896&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Tue Mar 18 10:13:30 2014
@@ -1,3 +1,13 @@
+glib2.0 (2.39.92-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * 0001-timer-test-use-volatile-for-locals.patch: Take patch from bgo #722604
+    to workaround gcc's intentional spec violation in the timer tests.
+    + Remove debian/patches/80-skip-timer-test.patch accordingly; it should
+      now work.
+
+ -- Iain Lane <laney at debian.org>  Tue, 18 Mar 2014 09:52:04 +0000
+
 glib2.0 (2.39.91-1) experimental; urgency=medium
 
   * New upstream release.

Added: desktop/experimental/glib2.0/debian/patches/0001-timer-test-use-volatile-for-locals.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/0001-timer-test-use-volatile-for-locals.patch?rev=40896&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/0001-timer-test-use-volatile-for-locals.patch	(added)
+++ desktop/experimental/glib2.0/debian/patches/0001-timer-test-use-volatile-for-locals.patch	[utf-8] Tue Mar 18 10:13:30 2014
@@ -0,0 +1,41 @@
+From d470c2f1f64ea7460b26dd446a5007f9faf04f4f Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Tue, 4 Mar 2014 09:20:38 -0500
+Subject: [PATCH] timer test: use 'volatile' for locals
+
+GCC seems to be failing to follow the letter of the C spec by allowing extra
+precision in floating point values to persist across assignments which are
+optimised away.
+
+Force its hand by using 'volatile' on the locals in question.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=722604
+---
+ glib/tests/timer.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glib/tests/timer.c b/glib/tests/timer.c
+index cb9a268..d6938f1 100644
+--- a/glib/tests/timer.c
++++ b/glib/tests/timer.c
+@@ -27,7 +27,7 @@ static void
+ test_timer_basic (void)
+ {
+   GTimer *timer;
+-  gdouble elapsed;
++  volatile gdouble elapsed;
+   gulong micros;
+ 
+   timer = g_timer_new ();
+@@ -44,7 +44,7 @@ static void
+ test_timer_stop (void)
+ {
+   GTimer *timer;
+-  gdouble elapsed, elapsed2;
++  volatile gdouble elapsed, elapsed2;
+ 
+   timer = g_timer_new ();
+ 
+-- 
+1.9.0
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=40896&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Tue Mar 18 10:13:30 2014
@@ -15,5 +15,5 @@
 gdbus-Let-the-pending-read-finish-before-closing-the.patch
 gdbus-tests-wait-up-to-60s-for-gdbus-testserver-to-t.patch
 gdbus-connection-wait-up-to-10s-to-actually-send-a-m.patch
-80-skip-timer-test.patch
 81-skip-monitor-test-on-non-linux.patch
+0001-timer-test-use-volatile-for-locals.patch