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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 002388c62be743d02eaef359d6afeea50134b124
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 16 18:27:03 2013 -0300

    Add patch to fix mips64(el) FTBFS.
    
    The patch has not yet been "fully" approved upstream, but already ACKed.
---
 debian/changelog                                   |    4 ++
 .../Fix_JavaScriptCore_ftbfs_on_mips64_el.patch    |   44 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 49 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 42d1c33..3c35ac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qt4-x11 (4:4.8.5+git121-g2a9ea11+dfsg-2) 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).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 16 Sep 2013 18:25:26 -0300
 
 qt4-x11 (4:4.8.5+git121-g2a9ea11+dfsg-1) unstable; urgency=low
diff --git a/debian/patches/Fix_JavaScriptCore_ftbfs_on_mips64_el.patch b/debian/patches/Fix_JavaScriptCore_ftbfs_on_mips64_el.patch
new file mode 100644
index 0000000..8396ef9
--- /dev/null
+++ b/debian/patches/Fix_JavaScriptCore_ftbfs_on_mips64_el.patch
@@ -0,0 +1,44 @@
+From b1f3d01f03bae04d7bc704556d7a00f124f24488 Mon Sep 17 00:00:00 2001
+From: YunQiang Su <wzssyqa at gmail.com>
+Date: Thu, 29 Aug 2013 13:05:53 +0800
+Subject: [PATCH] Fix JavaScriptCore ftbfs on mips64(el)
+
+Task-number: QTBUG-33187
+(cherry picked from qtscript/fdb622dad4d85894c5979b90ef2918307a8c9a8e)
+Change-Id: I2612d17ba159474595335adde8429a50e844dd4b
+---
+ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+index 17c06bf..f98fb72 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -325,7 +325,15 @@
+ 
+ #endif /* ARM */
+ 
++/* CPU(MIPS64) - MIPS 64-bit both BIG and LITTLE endian */
++#if (_MIPS_SIM == _ABI64)
++	#define WTF_CPU_MIPS64 1
++#endif
+ 
++/* CPU(MIPSN32) - MIPS N32 ABI both BIG and LITTLE endian */
++#if (_MIPS_SIM == _ABIN32)
++#define WTF_CPU_MIPSN32 1
++#endif
+ 
+ /* ==== OS() - underlying operating system; only to be used for mandated low-level services like 
+    virtual memory, not to choose a GUI toolkit ==== */
+@@ -873,7 +881,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(MIPS64)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64)
+ #define WTF_USE_JSVALUE32 1
+-- 
+1.8.4.rc3
+
diff --git a/debian/patches/series b/debian/patches/series
index 979ab22..fa691b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 # upstream patches
 Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
 QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch
+Fix_JavaScriptCore_ftbfs_on_mips64_el.patch
 
 # qt-copy patches
 0195-compositing-properties.diff

-- 
Qt 4 packaging