rev 6744 - in trunk/packages/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-07-16 20:14:45 +0000 (Mon, 16 Jul 2007)
New Revision: 6744

Added:
   trunk/packages/qt4-x11/debian/patches/42_alpha_fetch_and_add.dpatch
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/00list
Log:
* Add 42_alpha_fetch_and_add patch to fix broken threading on alpha, hangs
  uselessly on startup. fetch-and-add is supposed to return the original
  value before the addition. Thanks to Steve Langasek and Bradley Hughes.
  (Closes: #433031)


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2007-07-16 19:50:35 UTC (rev 6743)
+++ trunk/packages/qt4-x11/debian/changelog	2007-07-16 20:14:45 UTC (rev 6744)
@@ -1,3 +1,12 @@
+qt4-x11 (4.3.0-4) unstable; urgency=low
+
+  * Add 42_alpha_fetch_and_add patch to fix broken threading on alpha, hangs
+    uselessly on startup. fetch-and-add is supposed to return the original
+    value before the addition. Thanks to Steve Langasek and Bradley Hughes.
+    (Closes: #433031)
+
+ -- Fathi Boudra <fboudra at free.fr>  Mon, 16 Jul 2007 21:32:01 +0200
+
 qt4-x11 (4.3.0-3) unstable; urgency=low
 
   [Fathi Boudra]

Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list	2007-07-16 19:50:35 UTC (rev 6743)
+++ trunk/packages/qt4-x11/debian/patches/00list	2007-07-16 20:14:45 UTC (rev 6744)
@@ -20,6 +20,7 @@
 31_arm_eabi_fix
 40_alpha_ice
 41_disable_opengl_visibility
+42_alpha_fetch_and_add
 50_kfreebsd_build_fix
 51_kfreebsd_mkspecs
 60_m68k_inotify_fix

Added: trunk/packages/qt4-x11/debian/patches/42_alpha_fetch_and_add.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/42_alpha_fetch_and_add.dpatch	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/42_alpha_fetch_and_add.dpatch	2007-07-16 20:14:45 UTC (rev 6744)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 42_alpha_fetch_and_add.dpatch by Bradley Hughes <bhughes at trolltech.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fetch-and-add is supposed to return the original value before the addition.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~/src/corelib/arch/qatomic_alpha.h qt4-x11-4.3.0/src/corelib/arch/qatomic_alpha.h
+--- qt4-x11-4.3.0~/src/corelib/arch/qatomic_alpha.h	2007-05-25 15:24:09.000000000 +0200
++++ qt4-x11-4.3.0/src/corelib/arch/qatomic_alpha.h	2007-07-16 21:52:20.000000000 +0200
+@@ -190,7 +190,7 @@
+                  : "=&r" (old), "=&r" (tmp), "+m"(*ptr)
+                  : "r" (value)
+                  : "memory");
+-    return old != -1;
++    return old;
+ }
+ 
+ inline int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value)
+@@ -208,7 +208,7 @@
+                  : "=&r" (old), "=&r" (tmp), "+m"(*ptr)
+                  : "r" (value)
+                  : "memory");
+-    return old != -1;
++    return old;
+ }
+ 
+ inline int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value)
+@@ -226,7 +226,7 @@
+                  : "=&r" (old), "=&r" (tmp), "+m"(*ptr)
+                  : "r" (value)
+                  : "memory");
+-    return old != -1;
++    return old;
+ }
+ 
+ #else // !Q_CC_GNU


Property changes on: trunk/packages/qt4-x11/debian/patches/42_alpha_fetch_and_add.dpatch
___________________________________________________________________
Name: svn:executable
   + *