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

[Sune Vuorela]

Author: pusling-guest
Date: 2008-06-08 06:37:05 +0000 (Sun, 08 Jun 2008)
New Revision: 10890

Added:
   trunk/packages/qt4-x11/debian/patches/72_generic_arch_atomic_header_fix.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
Fix generic atomic header. (Closes: #475767)
This is enough to fix building of kdelibs, but there should be a proper 
hppa fix modelled over the other "real" archs.
+++ Changes by Fathi Boudra:

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-06-07 16:10:37 UTC (rev 10889)
+++ trunk/packages/qt4-x11/debian/changelog	2008-06-08 06:37:05 UTC (rev 10890)
@@ -1,5 +1,11 @@
-qt4-x11 (4.4.0-3) UNRELEASED; urgency=low
+qt4-x11 (4.4.0-3) unstable; urgency=low
 
+  * Fix generic atomic header. (Closes: #475767)
+    This is enough to fix building of kdelibs, but there should be a proper 
+    hppa fix modelled over the other "real" archs.
+
+  +++ Changes by Fathi Boudra:
+
   * Add qt-copy patch:
     * 0230-qtextcontrol-selectnextword
       Fix Ctrl+Shift+Right in a khtml textarea when having more than one tab
@@ -8,7 +14,7 @@
 
     * 0231- !!! we wait for ipv6 fix !!!
 
- -- Fathi Boudra <fabo at debian.org>  Sat, 31 May 2008 09:23:04 +0200
+ -- Sune Vuorela <debian at pusling.com>  Sun, 08 Jun 2008 08:28:00 +0200
 
 qt4-x11 (4.4.0-2) unstable; urgency=low
 

Added: trunk/packages/qt4-x11/debian/patches/72_generic_arch_atomic_header_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/72_generic_arch_atomic_header_fix.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/72_generic_arch_atomic_header_fix.diff	2008-06-08 06:37:05 UTC (rev 10890)
@@ -0,0 +1,17 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=475767
+
+This mostly affects hppa, but hppa is "community supported" - meaning that the Trolls doesn't care much.
+
+Index: b/src/corelib/arch/qatomic_generic.h
+===================================================================
+--- a/src/corelib/arch/qatomic_generic.h
++++ b/src/corelib/arch/qatomic_generic.h
+@@ -223,7 +223,7 @@
+ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
+ {
+     return reinterpret_cast<T *>
+-        (QBasicAtomicPointer_fetchAndStoreOrdered(&reinterpret_cast<void * volatile *>(&_q_value),
++        (QBasicAtomicPointer_fetchAndStoreOrdered(reinterpret_cast<void * volatile *>(&_q_value),
+                                                   newValue));
+ }
+ 

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-06-07 16:10:37 UTC (rev 10889)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-06-08 06:37:05 UTC (rev 10890)
@@ -35,5 +35,6 @@
 60_m68k_inotify_fix.diff
 70_hppa_ldcw_fix.diff
 71_hppa_unaligned_access_fix_458133.diff
+72_generic_arch_atomic_header_fix.diff
 80_hurd_max_path.diff
 90_gcc43.diff