[SCM] Qt 4 packaging branch, master, updated. debian/4.8.5+git121-g2a9ea11+dfsg-1-6-g2efeb73

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=2efeb73

The following commit has been merged in the master branch:
commit 2efeb73acce89cc7fd91b5129480fc29dc8f0163
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Oct 9 21:51:50 2013 -0300

    Fix patch.
---
 debian/changelog                 |    2 ++
 debian/patches/s390x_jscore.diff |   10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0787385..abfd84a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qt4-x11 (4:4.8.5+git121-g2a9ea11+dfsg1-1) UNRELEASED; urgency=low
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add Fix_JavaScriptCore_ftbfs_on_mips64_el.patch. It just needs to be
     approved upstream, but it has been already ACKed (Closes: #719763).
+    - Fix s390x_jscore.diff so it can be applied on top of the above mentioned
+    patch. This last one seems not pushed upstream.
   * Remove sources with minified javascript libs without source (Closes: #723036).
     - Increase DFSG revision number.
     I have tried building without those files and everything seems OK except a
diff --git a/debian/patches/s390x_jscore.diff b/debian/patches/s390x_jscore.diff
index 96ec0f4..118c157 100644
--- a/debian/patches/s390x_jscore.diff
+++ b/debian/patches/s390x_jscore.diff
@@ -1,8 +1,10 @@
 Description: Add support for s390/s390x architectures
+ Patch modified to also apply againt the MIPS64 patch.
 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
+Last-Update: 2013-10-09
+Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 
 ---
  src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h |   14 +++++++++++++-
@@ -29,12 +31,12 @@ Last-Update: 2011-08-03
  /* CPU(X86) - i386 / x86 32-bit */
  #if   defined(__i386__) \
      || defined(i386)     \
-@@ -873,7 +885,7 @@
+@@ -881,7 +893,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)
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64)
++#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(S390X)
  #define WTF_USE_JSVALUE64 1
  #elif CPU(ARM) || CPU(PPC64)
  #define WTF_USE_JSVALUE32 1

-- 
Qt 4 packaging