r31390 - in /desktop/experimental/glib2.0/debian: changelog patches/96-fix-one-bit-mutex-test-on-some-platforms.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Mon Nov 14 07:08:53 2011
New Revision: 31390

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31390
Log:
* debian/patches/96-fix-one-bit-mutex-test-on-some-platforms.patch:
  - Added, Fix the 1 bit mutex failing on platforms that have pointers
    aligned to 32 bits instead of 64 bits (bgo#201322).

Added:
    desktop/experimental/glib2.0/debian/patches/96-fix-one-bit-mutex-test-on-some-platforms.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=31390&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Mon Nov 14 07:08:53 2011
@@ -7,8 +7,11 @@
   * debian/rules: Don't ignore testsuite failures. If the testsuite turns out
     to be too brittle then we can always re-start ignoring it before upload to
     unstable.
-
- -- Sjoerd Simons <sjoerd at debian.org>  Mon, 14 Nov 2011 08:03:55 +0100
+  * debian/patches/96-fix-one-bit-mutex-test-on-some-platforms.patch:
+    - Added, Fix the 1 bit mutex failing on platforms that have pointers
+      aligned to 32 bits instead of 64 bits (bgo#201322).
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 14 Nov 2011 08:07:31 +0100
 
 glib2.0 (2.30.2-1) experimental; urgency=low
 

Added: desktop/experimental/glib2.0/debian/patches/96-fix-one-bit-mutex-test-on-some-platforms.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/96-fix-one-bit-mutex-test-on-some-platforms.patch?rev=31390&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/96-fix-one-bit-mutex-test-on-some-platforms.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/96-fix-one-bit-mutex-test-on-some-platforms.patch [utf-8] Mon Nov 14 07:08:53 2011
@@ -1,0 +1,34 @@
+From 48fbc8c37428d72dafec9b60900efaa2101bd460 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Sun, 13 Nov 2011 17:49:57 +0100
+Subject: [PATCH] Fix 1bit mutex test on platforms with 32 bit aligned
+ pointers
+
+The 1 bit mutex tests asserts: ((gsize) ptrs) % 8, ==, 0), which fails
+when the platform only aligns porters to 32 bits (e.g. S390 and
+powerpc).
+
+I'm not sure why this assertion was placed here, but given
+that internally g_pointer_bit_trylock uses g_atomic_int_or internally
+change the assertion so it only requires the alignment to be a multiple
+of sizeof(int)
+---
+ gthread/tests/1bit-mutex.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gthread/tests/1bit-mutex.c b/gthread/tests/1bit-mutex.c
+index 0bfce91..2a0f6dd 100644
+--- a/gthread/tests/1bit-mutex.c
++++ b/gthread/tests/1bit-mutex.c
+@@ -62,7 +62,7 @@ acquire (int      nr,
+ 
+   self = g_thread_self ();
+ 
+-  g_assert_cmpint (((gsize) ptrs) % 8, ==, 0);
++  g_assert_cmpint (((gsize) ptrs) % sizeof(gint), ==, 0);
+ 
+   if (!(use_pointers ?
+           g_pointer_bit_trylock (&ptrs[nr], bits[nr])
+-- 
+1.7.7.2
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=31390&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Mon Nov 14 07:08:53 2011
@@ -5,3 +5,4 @@
 61_glib-compile-schemas-path.patch
 90-gio-modules-multiarch-compat.patch
 95-gmain-get-rid-of-poll_waiting.patch
+96-fix-one-bit-mutex-test-on-some-platforms.patch