r35698 - in /desktop/experimental/glib2.0/debian: changelog patches/07_disable_gvariant_checksum_tests.patch patches/07_tests_gvariant_big_endian.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Thu Sep  6 04:14:33 2012
New Revision: 35698

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35698
Log:
Replace 07_disable_gvariant_checksum_tests.patch with
07_tests_gvariant_big_endian.patch which fixes the test properly instead
of disabling it. Taken from
https://bugzilla.gnome.org/show_bug.cgi?id=683384

Added:
    desktop/experimental/glib2.0/debian/patches/07_tests_gvariant_big_endian.patch
Removed:
    desktop/experimental/glib2.0/debian/patches/07_disable_gvariant_checksum_tests.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=35698&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Thu Sep  6 04:14:33 2012
@@ -5,6 +5,10 @@
   * debian/rules: Ignore test case failures on hurd-i386 (not a release
     architecture) and mips (this keeps tripping over a gdbus test race
     condition).
+  * Replace 07_disable_gvariant_checksum_tests.patch with
+    07_tests_gvariant_big_endian.patch which fixes the test properly instead
+    of disabling it. Taken from
+    https://bugzilla.gnome.org/show_bug.cgi?id=683384
 
  -- Martin Pitt <mpitt at debian.org>  Thu, 06 Sep 2012 05:38:04 +0200
 

Added: desktop/experimental/glib2.0/debian/patches/07_tests_gvariant_big_endian.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/07_tests_gvariant_big_endian.patch?rev=35698&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/07_tests_gvariant_big_endian.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/07_tests_gvariant_big_endian.patch [utf-8] Thu Sep  6 04:14:33 2012
@@ -1,0 +1,33 @@
+From 32bd7b446bceb86d0ae5b2bfeeac6011da2f0c98 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters at verbum.org>
+Date: Wed, 5 Sep 2012 09:04:58 -0400
+Subject: [PATCH] tests/gvariant: Fix test on big endian architectures
+
+We need to ensure we get the exact same byte-level GVariant, so
+byteswap on big endian architectures.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=683384
+---
+ glib/tests/gvariant.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/glib/tests/gvariant.c b/glib/tests/gvariant.c
+index 4e8282d..968b703 100644
+--- a/glib/tests/gvariant.c
++++ b/glib/tests/gvariant.c
+@@ -4201,6 +4201,13 @@ verify_gvariant_checksum_va (const gchar *sha256,
+ 
+   v = g_variant_new_va (fmt, NULL, &args);
+   g_variant_ref_sink (v);
++#if G_BYTE_ORDER == G_BIG_ENDIAN
++  {
++    GVariant *byteswapped = g_variant_byteswap (v);
++    g_variant_unref (v);
++    v = byteswapped;
++  }
++#endif
+ 
+   va_end (args);
+ 
+-- 
+1.7.11.4

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=35698&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Thu Sep  6 04:14:33 2012
@@ -3,7 +3,7 @@
 04_homedir_env.patch
 05_run-gio-tests-with-a-dbus-session.patch
 06_thread_test_ignore_prctl_fail.patch
-07_disable_gvariant_checksum_tests.patch
+07_tests_gvariant_big_endian.patch
 08_disable_gapplication_basic_test.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch