[qt] fix the outdated standalone copy of JavaScriptCore

[Dan Horák]

commit 064e0d8218867d49729de8dfbe598156c53126f3
Author: Dan Horák <dan at danny.cz>
Date:   Thu Jul 28 14:41:07 2011 +0200

    fix the outdated standalone copy of JavaScriptCore

 ...verywhere-opensource-src-4.8.0-beta1-s390.patch |   31 ++++++++++++++++++++
 qt.spec                                            |    9 +++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/qt-everywhere-opensource-src-4.8.0-beta1-s390.patch b/qt-everywhere-opensource-src-4.8.0-beta1-s390.patch
new file mode 100644
index 0000000..5f0bbf8
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.8.0-beta1-s390.patch
@@ -0,0 +1,31 @@
+diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390	2011-07-28 11:12:48.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2011-07-28 11:13:56.000000000 +0200
+@@ -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/qt.spec b/qt.spec
index f6b8d41..e890175 100644
--- a/qt.spec
+++ b/qt.spec
@@ -11,7 +11,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.8.0
-Release: 0.6.beta1%{?dist}
+Release: 0.7.beta1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -66,6 +66,9 @@ Patch65: qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch
 # hack around openssl type mismatch wrt SSL_CTX_ctrl (with and without const)
 Patch66: qt-everywhere-opensource-src-4.8.0-tp-openssl.patch
 
+# fix the outdated standalone copy of JavaScriptCore
+Patch67: qt-everywhere-opensource-src-4.8.0-beta1-s390.patch
+
 # upstream patches
 
 # security patches
@@ -401,6 +404,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
 %patch64 -p1 -b .QTBUG-14467
 %patch65 -p1 -b .qtreeview-kpackagekit-crash
 %patch66 -p1 -b .ssl
+%patch67 -p1 -b .s390
 
 # upstream patches
 
@@ -1029,6 +1033,9 @@ fi
 
 
 %changelog
+* Thu Jul 28 2011 Dan Horák <dan[at]danny.cz> 1:4.8.0-0.7.beta1
+- fix the outdated standalone copy of JavaScriptCore
+
 * Sat Jul 23 2011 Rex Dieter <rdieter at fedoraproject.org> 1:4.8.0-0.6.beta1
 - fix QMAKE_LIBDIR_QT, for missing QT_SHARED define (#725183)