On Wed, Jun 21, 2006 at 06:31:22PM +0200, Bastian Blank wrote: > The attached patch fixes the build problem. Really attached this time. Bastian -- Even historians fail to learn from history -- they repeat the same mistakes. -- John Gill, "Patterns of Force", stardate 2534.7
diff -u qt4-x11-4.1.3/debian/patches/00list qt4-x11-4.1.3/debian/patches/00list
--- qt4-x11-4.1.3/debian/patches/00list
+++ qt4-x11-4.1.3/debian/patches/00list
@@ -8,0 +9 @@
+19_s390_atomic
diff -u qt4-x11-4.1.3/debian/changelog qt4-x11-4.1.3/debian/changelog
--- qt4-x11-4.1.3/debian/changelog
+++ qt4-x11-4.1.3/debian/changelog
@@ -1,3 +1,11 @@
+qt4-x11 (4.1.3-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debiaqn/patches/19_s390_atomic: Fix including of s390 specific atomic
+ header. (Closes: #370241)
+
+ -- Bastian Blank <waldi@debian.org> Wed, 21 Jun 2006 16:04:28 +0000
+
qt4-x11 (4.1.3-2) unstable; urgency=high
* patches/18_disable_opengl_visibility: disable -fvisibility-inlines-hidden
only in patch2:
unchanged:
--- qt4-x11-4.1.3.orig/debian/patches/19_s390_atomic.dpatch
+++ qt4-x11-4.1.3/debian/patches/19_s390_atomic.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 19_s390_atomic.dpatch by Bastian Blank <waldi@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@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) ({ \
Attachment:
signature.asc
Description: Digital signature