[SCM] qtscript packaging branch, master, updated. debian/5.0.2+dfsg-2-6-gbaef3e3

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtscript.git;a=commitdiff;h=baef3e3

The following commit has been merged in the master branch:
commit baef3e30903b8398ae546863200c1c4ae037a308
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jun 10 20:21:55 2013 +0200

    support s390/s390x
    
    copy patch s390x_jscore.diff from qt4-x11 (which is a backport of an upstream commit)
---
 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 d97201f..d1a99bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtscript-opensource-src (5.0.2+dfsg-3) UNRELEASED; urgency=low
 
   [ Pino Toscano ]
   * debian/control: remove extra ${misc:Pre-Depends} from qtscript5-examples.
+  * Copy patch s390x_jscore.diff from qt4-x11 (which is a backport of an
+    upstream commit) to support s390/s390x.
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Build the documentation shipped with this submodule as a build-indep task:
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 09eac9d..426a245 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable_v8_sunspider_tests.patch
+s390x_jscore.diff

-- 
qtscript packaging