Bug#699862: updated debdiff to build qt4-x11 on x32
Hi,
attached is the debdiff rebased against current source.
bye,
//mirabilos
--
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-235
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Alexander Steeg
diff -Nru qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/changelog qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/changelog
--- qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/changelog 2014-09-04 21:25:55.000000000 +0200
+++ qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/changelog 2014-10-24 18:05:49.000000000 +0200
@@ -1,3 +1,10 @@
+qt4-x11 (4:4.8.6+git64-g5dc8b2b+dfsg-2+x32.1) unreleased; urgency=medium
+
+ * Reapply patch from Daniel Schepler
+ * Refresh these patches
+
+ -- Thorsten Glaser <tg@mirbsd.de> Fri, 24 Oct 2014 18:05:39 +0200
+
qt4-x11 (4:4.8.6+git64-g5dc8b2b+dfsg-2) unstable; urgency=medium
[ Lisandro Damián Nicanor Pérez Meyer ]
@@ -44,6 +51,13 @@
-- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Fri, 25 Jul 2014 14:07:38 -0300
+qt4-x11 (4:4.8.6+dfsg-2+x32) unreleased; urgency=low
+
+ * Add support for x32, using qatomic_i386.h which is compatible.
+ The QtScript configuration disables the JIT compiler on x32.
+
+ -- Daniel Schepler <schepler@debian.org> Fri, 04 Jul 2014 20:07:58 -0700
+
qt4-x11 (4:4.8.6+dfsg-2) unstable; urgency=medium
[ Dmitry Shachnev ]
diff -Nru qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/patches/QtScript_x32_config.diff qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/patches/QtScript_x32_config.diff
--- qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/patches/QtScript_x32_config.diff 1970-01-01 01:00:00.000000000 +0100
+++ qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/patches/QtScript_x32_config.diff 2014-10-24 18:05:34.000000000 +0200
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -213,8 +213,12 @@
+ /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
+ #if defined(__x86_64__) \
+ || defined(_M_X64)
++#ifdef __ILP32__
++#define WTF_CPU_X86_64_32 1
++#else
+ #define WTF_CPU_X86_64 1
+ #endif
++#endif
+
+ /* 64-bit mode on AIX */
+ #ifdef __64BIT__
diff -Nru qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/patches/series qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/patches/series
--- qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/patches/series 2014-09-04 21:15:07.000000000 +0200
+++ qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/patches/series 2014-10-24 18:03:08.000000000 +0200
@@ -54,3 +54,5 @@
remove_addsense.patch
parisc-atomic.patch
ppc64el_configure_support.patch
+QtScript_x32_config.diff
+x32.diff
diff -Nru qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/patches/x32.diff qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/patches/x32.diff
--- qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/patches/x32.diff 1970-01-01 01:00:00.000000000 +0100
+++ qt4-x11-4.8.6+git64-g5dc8b2b+dfsg/debian/patches/x32.diff 2014-10-24 18:05:32.000000000 +0200
@@ -0,0 +1,33 @@
+--- a/configure
++++ b/configure
+@@ -3329,6 +3329,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+ fi
+ CFG_HOST_ARCH=sh
+ ;;
++ *:*:x32)
++ if [ "$OPT_VERBOSE" = "yes" ]; then
++ echo " 32-bit AMD 80x86 (x32)"
++ fi
++ CFG_HOST_ARCH=x32
++ ;;
+ *:*:*)
+ if [ "$OPT_VERBOSE" = "yes" ]; then
+ echo " Trying '$UNAME_MACHINE'..."
+--- a/src/corelib/arch/qatomic_arch.h
++++ b/src/corelib/arch/qatomic_arch.h
+@@ -92,6 +92,8 @@ QT_BEGIN_HEADER
+ # include "QtCore/qatomic_sh.h"
+ #elif defined(QT_ARCH_SH4A)
+ # include "QtCore/qatomic_sh4a.h"
++#elif defined(QT_ARCH_X32)
++# include "QtCore/qatomic_i386.h"
+ #elif defined(QT_ARCH_NACL)
+ # include "QtCore/qatomic_generic.h"
+ #elif defined(QT_ARCH_AARCH64)
+--- /dev/null
++++ b/src/corelib/arch/x32/arch.pri
+@@ -0,0 +1,4 @@
++#
++# X32 architecture
++#
++# nothing special needed here
Reply to: