[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week13-2-5-g19e8f49

[Pino Toscano]

The following commit has been merged in the master branch:
commit e4e92a8dca19121b569865f8841d2a01d0123e9e
Author: Pino Toscano <pino at debian.org>
Date:   Wed Aug 10 21:07:27 2011 +0200

    add patch s390.diff from upstream to support s390x (#637004)
---
 debian/changelog         |    1 +
 debian/patches/s390.diff |   36 ++++++++++++++++++++++++++++++++++++
 debian/patches/series    |    1 +
 3 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b19a74c..b0c545b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtwebkit (2.1.0~2011week13-3) UNRELEASED; urgency=low
   * Use wildcard architectures: (Closes: #634388)
     - !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 -> linux-any
     - kfreebsd-i386 kfreebsd-amd64 hurd-i386 -> !linux-any
+  * Add patch s390.diff from upstream to support s390x. (Closes: #637004)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 21 Jun 2011 12:52:21 +0200
 
diff --git a/debian/patches/s390.diff b/debian/patches/s390.diff
new file mode 100644
index 0000000..0a1c334
--- /dev/null
+++ b/debian/patches/s390.diff
@@ -0,0 +1,36 @@
+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-06
+
+--- a/JavaScriptCore/wtf/Platform.h
++++ b/JavaScriptCore/wtf/Platform.h
+@@ -186,6 +186,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)     \
+@@ -917,6 +929,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_TRADITIONAL) || CPU(PPC64) || CPU(MIPS)
+
diff --git a/debian/patches/series b/debian/patches/series
index cb8cf87..b2b59cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ no_gc_sections.diff
 09_hurd.diff
 linux_amd64_no_overcommit.diff
 defines_qt_webkit.diff
+s390.diff

-- 
QtWebKit packaging