diff -Nru qt4-x11-4.8.2+dfsg/debian/changelog qt4-x11-4.8.2+dfsg/debian/changelog --- qt4-x11-4.8.2+dfsg/debian/changelog 2013-01-19 11:48:19.000000000 -0800 +++ qt4-x11-4.8.2+dfsg/debian/changelog 2013-02-05 10:52:14.000000000 -0800 @@ -1,3 +1,10 @@ +qt4-x11 (4:4.8.2+dfsg-10+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 Tue, 05 Feb 2013 10:52:06 -0800 + qt4-x11 (4:4.8.2+dfsg-10) unstable; urgency=medium * Add SSL-certificates-blacklist-mis-issued-Turktrust-cert.patch to blacklist diff -Nru qt4-x11-4.8.2+dfsg/debian/patches/QtScript_x32_config.diff qt4-x11-4.8.2+dfsg/debian/patches/QtScript_x32_config.diff --- qt4-x11-4.8.2+dfsg/debian/patches/QtScript_x32_config.diff 1969-12-31 16:00:00.000000000 -0800 +++ qt4-x11-4.8.2+dfsg/debian/patches/QtScript_x32_config.diff 2013-02-05 10:48:51.000000000 -0800 @@ -0,0 +1,17 @@ +Index: qt4-x11-4.8.2+dfsg/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +=================================================================== +--- qt4-x11-4.8.2+dfsg.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2013-02-05 10:45:17.000000000 -0800 ++++ qt4-x11-4.8.2+dfsg/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2013-02-05 10:48:49.000000000 -0800 +@@ -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.2+dfsg/debian/patches/series qt4-x11-4.8.2+dfsg/debian/patches/series --- qt4-x11-4.8.2+dfsg/debian/patches/series 2013-01-19 11:37:34.000000000 -0800 +++ qt4-x11-4.8.2+dfsg/debian/patches/series 2013-02-05 10:48:11.000000000 -0800 @@ -54,3 +54,5 @@ no_libicu_message.diff QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch fix_use_after_free_qlocale_unix.patch +x32.diff +QtScript_x32_config.diff diff -Nru qt4-x11-4.8.2+dfsg/debian/patches/x32.diff qt4-x11-4.8.2+dfsg/debian/patches/x32.diff --- qt4-x11-4.8.2+dfsg/debian/patches/x32.diff 1969-12-31 16:00:00.000000000 -0800 +++ qt4-x11-4.8.2+dfsg/debian/patches/x32.diff 2013-02-05 12:04:53.000000000 -0800 @@ -0,0 +1,39 @@ +Index: qt4-x11-4.8.2+dfsg/configure +=================================================================== +--- qt4-x11-4.8.2+dfsg.orig/configure 2013-02-05 10:45:17.000000000 -0800 ++++ qt4-x11-4.8.2+dfsg/configure 2013-02-05 10:46:57.000000000 -0800 +@@ -3254,6 +3254,12 @@ + 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'..." +Index: qt4-x11-4.8.2+dfsg/src/corelib/arch/qatomic_arch.h +=================================================================== +--- qt4-x11-4.8.2+dfsg.orig/src/corelib/arch/qatomic_arch.h 2012-04-26 12:46:08.000000000 -0700 ++++ qt4-x11-4.8.2+dfsg/src/corelib/arch/qatomic_arch.h 2013-02-05 10:47:47.000000000 -0800 +@@ -90,6 +90,8 @@ + # 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" + #else +Index: qt4-x11-4.8.2+dfsg/src/corelib/arch/x32/arch.pri +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ qt4-x11-4.8.2+dfsg/src/corelib/arch/x32/arch.pri 2013-02-05 12:04:49.000000000 -0800 +@@ -0,0 +1,4 @@ ++# ++# X32 architecture ++# ++# nothing special needed here