[SCM] Qt 4 packaging branch, master, updated. debian/4.8.7+dfsg-1-1-g679da46

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=679da46

The following commit has been merged in the master branch:
commit 679da46f00f1a3fe4b796c90c0d03a8fc7b90c86
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue May 26 14:14:32 2015 -0300

    New changelog entry.
---
 debian/changelog                        |  8 ++++++++
 debian/patches/QtScript_x32_config.diff | 15 +++++++++++++++
 debian/patches/series                   |  2 ++
 debian/patches/x32.diff                 | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4ab4158..7218d37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qt4-x11 (4:4.8.7+dfsg-2) UNRELEASED; urgency=medium
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add Daniel Schepler's QtScript_x32_config.diff and x32.diff to let Qt4
+    compile on x32 (Closes: #699862).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 May 2015 14:14:19 -0300
+
 qt4-x11 (4:4.8.7+dfsg-1) unstable; urgency=medium
 
   * New upstream release, possibly the latest point release for Qt4.
diff --git a/debian/patches/QtScript_x32_config.diff b/debian/patches/QtScript_x32_config.diff
new file mode 100644
index 0000000..4789012
--- /dev/null
+++ b/debian/patches/QtScript_x32_config.diff
@@ -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 --git a/debian/patches/series b/debian/patches/series
index 368f4b7..5416cfb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,3 +50,5 @@ qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch
 qtdoc-build-offline-docs.patch
 remove_addsense.patch
 parisc-atomic.patch
+QtScript_x32_config.diff
+x32.diff
diff --git a/debian/patches/x32.diff b/debian/patches/x32.diff
new file mode 100644
index 0000000..f73dc1c
--- /dev/null
+++ b/debian/patches/x32.diff
@@ -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

-- 
Qt 4 packaging