[SCM] Qt 4 packaging branch, master, updated. debian/4.7.3-5-3-g799bf77

[Pino Toscano]

The following commit has been merged in the master branch:
commit 799bf7712231e4a37765f908829b41d8232e574c
Author: Pino Toscano <pino at debian.org>
Date:   Tue Aug 9 11:28:42 2011 +0200

    add patch s390x_jscore.diff (#636544)
---
 debian/changelog                 |    2 +
 debian/patches/s390x_jscore.diff |   70 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |    1 +
 3 files changed, 73 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 979dcc5..41d0ee3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qt4-x11 (4:4.7.3-6~0) UNRELEASED; urgency=low
   * Add patch Check-if-the-interpolators-have-already-been-deleted.patch
     to fix QVariantAnimation::registerInterpolator() crash during global dtors
     run. (Closes: #635724)
+  * Add patch s390x_jscore.diff to add s390/s390x support in JavaScriptCore.
+    (Closes: #636544)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 09 Aug 2011 11:01:35 +0200
 
diff --git a/debian/patches/s390x_jscore.diff b/debian/patches/s390x_jscore.diff
new file mode 100644
index 0000000..0abe431
--- /dev/null
+++ b/debian/patches/s390x_jscore.diff
@@ -0,0 +1,70 @@
+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 +++++++++++++-
+ src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h         |   13 +++++++++++++
+ 2 files changed, 26 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)     \
+@@ -870,7 +882,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
+--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+@@ -180,6 +180,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)     \
+@@ -885,6 +897,7 @@
+ #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
+     || (CPU(IA64) && !CPU(IA64_32)) \
+     || CPU(ALPHA) \
++    || CPU(S390X) \
+     || CPU(SPARC64)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64) || CPU(MIPS)
diff --git a/debian/patches/series b/debian/patches/series
index 479fb1b..716b087 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -53,3 +53,4 @@ kfreebsd_monotonic_clock.diff
 powerpc_designer_gstabs.diff
 armv6_Include_explicitly_IT_instructions.patch
 armv6_Add_support_for_ARMv7_atomic_operations.patch
+s390x_jscore.diff

-- 
Qt 4 packaging