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

[Brian Nelson]

Author: pyro
Date: 2006-06-21 16:55:29 +0000 (Wed, 21 Jun 2006)
New Revision: 4006

Added:
   trunk/packages/qt4-x11/debian/patches/19_s390_atomic.dpatch
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/00list
Log:
  * debian/patches/19_s390_atomic: patch from Bastian Blank to fix
    including of s390 specific atomic header. (Closes: #370241)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-06-21 16:09:35 UTC (rev 4005)
+++ trunk/packages/qt4-x11/debian/changelog	2006-06-21 16:55:29 UTC (rev 4006)
@@ -1,3 +1,10 @@
+qt4-x11 (4.1.3-3) UNRELEASED; urgency=low
+
+  * debian/patches/19_s390_atomic: patch from Bastian Blank to fix
+    including of s390 specific atomic header. (Closes: #370241)
+
+ -- Brian Nelson <pyro at debian.org>  Wed, 21 Jun 2006 09:54:33 -0700
+
 qt4-x11 (4.1.3-2) unstable; urgency=high
 
   * patches/18_disable_opengl_visibility: disable -fvisibility-inlines-hidden

Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list	2006-06-21 16:09:35 UTC (rev 4005)
+++ trunk/packages/qt4-x11/debian/patches/00list	2006-06-21 16:55:29 UTC (rev 4006)
@@ -6,3 +6,4 @@
 16_hppa_ldcw_fix
 17_alpha_ice
 18_disable_opengl_visibility
+19_s390_atomic

Added: trunk/packages/qt4-x11/debian/patches/19_s390_atomic.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/19_s390_atomic.dpatch	2006-06-21 16:09:35 UTC (rev 4005)
+++ trunk/packages/qt4-x11/debian/patches/19_s390_atomic.dpatch	2006-06-21 16:55:29 UTC (rev 4006)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 19_s390_atomic.dpatch by Bastian Blank <waldi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.1.3~/src/corelib/arch/s390/arch/qatomic.h qt4-x11-4.1.3/src/corelib/arch/s390/arch/qatomic.h
+--- qt4-x11-4.1.3~/src/corelib/arch/s390/arch/qatomic.h	2006-05-14 10:47:14.000000000 +0000
++++ qt4-x11-4.1.3/src/corelib/arch/s390/arch/qatomic.h	2006-06-21 16:02:04.000000000 +0000
+@@ -24,6 +24,8 @@
+ #ifndef S390_QATOMIC_H
+ #define S390_QATOMIC_H
+ 
++#include <QtCore/qglobal.h>
++
+ QT_BEGIN_HEADER
+ 
+ #define __CS_LOOP(ptr, op_val, op_string) ({				\