From ce618aa7f6ca4d396a760c7f516c20842847b215 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 15 Feb 2019 08:59:10 -0600 Subject: [PATCH] 5.12.1 --- .gitignore | 1 + qt5-qtscript.spec | 7 +++++-- ...ch => qtscript-everywhere-src-5.12.1-s390.patch | 14 +++++++------- sources | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) rename qtscript-opensource-src-5.5.0-s390.patch => qtscript-everywhere-src-5.12.1-s390.patch (59%) diff --git a/.gitignore b/.gitignore index b89ebe1..927965b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /qtscript-everywhere-src-5.11.1.tar.xz /qtscript-everywhere-src-5.11.2.tar.xz /qtscript-everywhere-src-5.11.3.tar.xz +/qtscript-everywhere-src-5.12.1.tar.xz diff --git a/qt5-qtscript.spec b/qt5-qtscript.spec index 1dd218b..976c3a3 100644 --- a/qt5-qtscript.spec +++ b/qt5-qtscript.spec @@ -14,8 +14,8 @@ Summary: Qt5 - QtScript component Name: qt5-%{qt_module} -Version: 5.11.3 -Release: 2%{?dist} +Version: 5.12.1 +Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -137,6 +137,9 @@ fi %changelog +* Fri Feb 15 2019 Rex Dieter - 5.12.1-1 +- 5.12.1 + * Sat Feb 02 2019 Fedora Release Engineering - 5.11.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/qtscript-opensource-src-5.5.0-s390.patch b/qtscript-everywhere-src-5.12.1-s390.patch similarity index 59% rename from qtscript-opensource-src-5.5.0-s390.patch rename to qtscript-everywhere-src-5.12.1-s390.patch index e7871f4..76a7abb 100644 --- a/qtscript-opensource-src-5.5.0-s390.patch +++ b/qtscript-everywhere-src-5.12.1-s390.patch @@ -1,6 +1,6 @@ -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 +diff -up qtscript-everywhere-src-5.12.1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 qtscript-everywhere-src-5.12.1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +--- qtscript-everywhere-src-5.12.1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 2019-01-09 06:59:11.000000000 -0600 ++++ qtscript-everywhere-src-5.12.1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2019-02-15 08:57:27.684231337 -0600 @@ -226,6 +226,18 @@ #define WTF_CPU_SPARC 1 #endif @@ -20,12 +20,12 @@ diff -up qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCor /* CPU(X86) - i386 / x86 32-bit */ #if defined(__i386__) \ || defined(i386) \ -@@ -950,7 +962,7 @@ +@@ -960,7 +972,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) + #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) || CPU(RISCV64) #define WTF_USE_JSVALUE64 1 --#elif CPU(ARM) || CPU(PPC64) -+#elif CPU(ARM) || CPU(PPC64) || CPU(S390X) +-#elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32) ++#elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32) || CPU(S390X) #define WTF_USE_JSVALUE32 1 #elif OS(WINDOWS) && COMPILER(MINGW) /* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg diff --git a/sources b/sources index 73aa8f1..b15a7f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtscript-everywhere-src-5.11.3.tar.xz) = 987f9a13a698e3f498ea7408f4a9b2379969e901aa6b672ab2733af9d65fe79dd27af5f67aff5d7ab1903b5889c82359970ac81cf27f1eb2bad1e36eaa376b30 +SHA512 (qtscript-everywhere-src-5.12.1.tar.xz) = 1fe7d0582e6c61fd146d66080bc91b40a6a2bda9b6bdb983339276b1aebb6f3c24070fc5acb2fd90556c11d51708c7bc75542532097b7f4f381b13dadaec5c9e