[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.0-1-7-gc2faa6e

[Fathi Boudra]

The following commit has been merged in the experimental branch:
commit c2faa6e67c67de0af7ca99c5efb04867f00a6f4e
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Jan 6 21:13:12 2012 +0200

    Re-add patch s390x_jscore.diff to add s390/s390x support in JavaScriptCore.
    The patch was partly merged in Qt 4.8.
---
 debian/changelog                 |    2 +
 debian/patches/s390x_jscore.diff |   40 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |    1 +
 3 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80e735f..66b713f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qt4-x11 (4:4.8.0-2) UNRELEASED; urgency=low
   * Use multiarch for importsdir:
     - update debian/libqt4-declarative-*.install files.
     - mark QML plugin packages as Multi-Arch: same.
+  * Re-add patch s390x_jscore.diff to add s390/s390x support in JavaScriptCore.
+    The patch was partly merged in Qt 4.8.
 
  -- Fathi Boudra <fabo at debian.org>  Wed, 04 Jan 2012 22:15:56 +0200
 
diff --git a/debian/patches/s390x_jscore.diff b/debian/patches/s390x_jscore.diff
new file mode 100644
index 0000000..96ec0f4
--- /dev/null
+++ b/debian/patches/s390x_jscore.diff
@@ -0,0 +1,40 @@
+Description: Add support for s390/s390x architectures
+Author: Dan Horák <dan at danny.cz>
+Origin: vendor (http://trac.webkit.org/changeset?old_path=%2Ftrunk&old=71843+&new_path=%2Ftrunk&new=71844+)
+Forwarded: no
+Last-Update: 2011-08-03
+
+---
+ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h |   14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -189,6 +189,18 @@
+ #define WTF_CPU_SPARC 1
+ #endif
+ 
++/* CPU(S390X) - S390 64-bit */
++#if defined(__s390x__)
++#define WTF_CPU_S390X 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
++/* CPU(S390) - S390 32-bit */
++#if defined(__s390__)
++#define WTF_CPU_S390 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
+ /* CPU(X86) - i386 / x86 32-bit */
+ #if   defined(__i386__) \
+     || defined(i386)     \
+@@ -873,7 +885,7 @@
+ #endif
+ 
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64)
++#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64)
+ #define WTF_USE_JSVALUE32 1
diff --git a/debian/patches/series b/debian/patches/series
index 87007ec..d944ac6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -41,4 +41,5 @@ powerpc_designer_gstabs.diff
 qt-multiarch-plugin-path-compat.diff
 fix_ftbfs_format-security.patch
 fix_qvfb_build.patch
+s390x_jscore.diff
 add_missing_method_for_QBasicAtomicPointer_on_s390.patch

-- 
Qt 4 packaging