From d12c55f83154873bfdd3aeaf38f5dc5cf69bb2df Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 16 Jul 2015 09:57:57 -0500 Subject: [PATCH] rebase s390.patch --- qt5-qtscript.spec | 2 +- ....patch => qtscript-opensource-src-5.5.0-s390.patch | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) rename qtscript-opensource-src-5.2.0-s390.patch => qtscript-opensource-src-5.5.0-s390.patch (65%) diff --git a/qt5-qtscript.spec b/qt5-qtscript.spec index 5a9abbd..c9bc3d0 100644 --- a/qt5-qtscript.spec +++ b/qt5-qtscript.spec @@ -18,7 +18,7 @@ Url: http://www.qt.io Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz # add s390(x0 support to Platform.h (taken from webkit) -Patch0: qtscript-opensource-src-5.2.0-s390.patch +Patch0: qtscript-opensource-src-5.5.0-s390.patch BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: pkgconfig(Qt5UiTools) diff --git a/qtscript-opensource-src-5.2.0-s390.patch b/qtscript-opensource-src-5.5.0-s390.patch similarity index 65% rename from qtscript-opensource-src-5.2.0-s390.patch rename to qtscript-opensource-src-5.5.0-s390.patch index 5d26399..e7871f4 100644 --- a/qtscript-opensource-src-5.2.0-s390.patch +++ b/qtscript-opensource-src-5.5.0-s390.patch @@ -1,8 +1,7 @@ -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -index 85ed8a7..9c419da 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -@@ -189,6 +189,18 @@ +diff -up qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +--- qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 2015-06-29 15:05:58.000000000 -0500 ++++ qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2015-07-16 09:57:18.963167137 -0500 +@@ -226,6 +226,18 @@ #define WTF_CPU_SPARC 1 #endif @@ -21,7 +20,7 @@ index 85ed8a7..9c419da 100644 /* CPU(X86) - i386 / x86 32-bit */ #if defined(__i386__) \ || defined(i386) \ -@@ -913,7 +925,7 @@ +@@ -950,7 +962,7 @@ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) #if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) #define WTF_USE_JSVALUE64 1