r23263 - in /desktop/experimental/glib2.0/debian: changelog patches/05_gvariant_test_failure.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sat Mar 13 00:46:48 2010
New Revision: 23263

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23263
Log:
* debian/patches/05_gvariant_test_failure.patch:
  - Backport patch from upstream git to fix a gvariant test that fails
    randomly on x86.

Added:
    desktop/experimental/glib2.0/debian/patches/05_gvariant_test_failure.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=23263&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Sat Mar 13 00:46:48 2010
@@ -1,3 +1,11 @@
+glib2.0 (2.23.5-2) UNRELEASED; urgency=low
+
+  * debian/patches/05_gvariant_test_failure.patch:
+    - Backport patch from upstream git to fix a gvariant test that fails
+      randomly on x86.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 13 Mar 2010 01:18:35 +0100
+
 glib2.0 (2.23.5-1) experimental; urgency=low
 
   [ Emilio Pozuelo Monfort ]

Added: desktop/experimental/glib2.0/debian/patches/05_gvariant_test_failure.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/05_gvariant_test_failure.patch?rev=23263&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/05_gvariant_test_failure.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/05_gvariant_test_failure.patch [utf-8] Sat Mar 13 00:46:48 2010
@@ -1,0 +1,37 @@
+From 5b19345246aa179788b09b7a82702e79f9d815d8 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Fri, 12 Mar 2010 20:38:47 +0000
+Subject: Bug 610858 - gvariant test fails sometimes
+
+NaN floating point values get mangled when passing across the function
+call ABI on x86 so avoid using them to get rid of spurious failures.
+
+Reported by Christian Persch and reliably reproduced by Emilio Pozuelo
+Monfort.
+---
+diff --git a/glib/tests/gvariant.c b/glib/tests/gvariant.c
+index ec28e76..af648a7 100644
+--- a/glib/tests/gvariant.c
++++ b/glib/tests/gvariant.c
+@@ -1933,13 +1933,18 @@ tree_instance_new (const GVariantType *type,
+       instance->data_size = 4;
+       break;
+ 
+-    case 'x': case 't': case 'd':
++    case 'x': case 't':
+       instance->data.integer = g_test_rand_int ();
+       instance->data.integer <<= 32;
+       instance->data.integer |= (guint32) g_test_rand_int ();
+       instance->data_size = 8;
+       break;
+ 
++    case 'd':
++      instance->data.floating = g_test_rand_double ();
++      instance->data_size = 8;
++      break;
++
+     case 's': case 'o': case 'g':
+       instance->data_size = g_test_rand_int_range (10, 20);
+       make_random_string (instance->data.string, instance->data_size, type);
+--
+cgit v0.8.3.1

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=23263&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Sat Mar 13 00:46:48 2010
@@ -2,4 +2,5 @@
 02_gettext-desktopfiles-ubuntu.patch
 03_blacklist-directories.patch
 04_homedir_env.patch
+05_gvariant_test_failure.patch
 60_wait-longer-for-threads-to-die.patch