diff --git a/.gitignore b/.gitignore index 5566a62..4190fae 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qtscript-opensource-src-5.2.1.tar.xz +/qtscript-opensource-src-5.3.0.tar.xz diff --git a/qt5-qtscript.spec b/qt5-qtscript.spec index 8085729..0b3e754 100644 --- a/qt5-qtscript.spec +++ b/qt5-qtscript.spec @@ -3,25 +3,21 @@ Summary: Qt5 - QtScript component Name: qt5-%{qt_module} -Version: 5.2.1 +Version: 5.3.0 Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://qt-project.org/ %if 0%{?pre:1} -Source0: http://download.qt-project.org/development_releases/qt/5.2/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz +Source0: http://download.qt-project.org/development_releases/qt/5.3/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz %else -Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz %endif # add s390(x0 support to Platform.h (taken from webkit) Patch0: qtscript-opensource-src-5.2.0-s390.patch -## upstream patches -# https://codereview.qt-project.org/#change,74927 -Patch101: qtscript-opensource-src-5.2.0-aarch64.patch - BuildRequires: qt5-qtbase-devel >= %{version} # -docs, for qhelpgenerator BuildRequires: qt5-qttools-devel @@ -58,7 +54,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}} %patch0 -p1 -b .s390 -%patch101 -p1 -b .aarch64 %build @@ -113,6 +108,9 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la %changelog +* Wed May 21 2014 Jan Grulich 5.3.0-1 +- 5.3.0 + * Wed Feb 05 2014 Rex Dieter 5.2.1-1 - 5.2.1 diff --git a/qtscript-opensource-src-5.2.0-aarch64.patch b/qtscript-opensource-src-5.2.0-aarch64.patch deleted file mode 100644 index ed3eb4d..0000000 --- a/qtscript-opensource-src-5.2.0-aarch64.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up qtscript-opensource-src-5.2.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.0001 qtscript-opensource-src-5.2.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ---- qtscript-opensource-src-5.2.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.0001 2014-02-02 15:44:26.963661307 -0600 -+++ qtscript-opensource-src-5.2.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2014-02-02 15:45:27.948011348 -0600 -@@ -221,6 +221,14 @@ - #define WTF_CPU_AIX64 1 - #endif - -+/* CPU(AARCH64) - AArch64 */ -+#if defined(__aarch64__) -+#define WTF_CPU_AARCH64 1 -+#if defined(__AARCH64EB__) -+#define WTF_CPU_BIG_ENDIAN 1 -+#endif -+#endif -+ - /* CPU(ARM) - ARM, any version*/ - #if defined(arm) \ - || defined(__arm__) \ -@@ -908,7 +916,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) || 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(AARCH64) - #define WTF_USE_JSVALUE64 1 - #elif CPU(ARM) || CPU(PPC64) || CPU(S390X) - #define WTF_USE_JSVALUE32 1 diff --git a/qtscript-opensource-src-5.2.0-s390.patch b/qtscript-opensource-src-5.2.0-s390.patch index 1a0a62d..5d26399 100644 --- a/qtscript-opensource-src-5.2.0-s390.patch +++ b/qtscript-opensource-src-5.2.0-s390.patch @@ -1,6 +1,7 @@ -diff -up qtscript-opensource-src-5.2.0-rc1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 qtscript-opensource-src-5.2.0-rc1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ---- qtscript-opensource-src-5.2.0-rc1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 2013-11-26 19:00:28.000000000 -0600 -+++ qtscript-opensource-src-5.2.0-rc1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2013-12-02 13:43:02.144456614 -0600 +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 @@ #define WTF_CPU_SPARC 1 #endif @@ -20,9 +21,9 @@ diff -up qtscript-opensource-src-5.2.0-rc1/src/3rdparty/javascriptcore/JavaScrip /* CPU(X86) - i386 / x86 32-bit */ #if defined(__i386__) \ || defined(i386) \ -@@ -898,7 +910,7 @@ +@@ -913,7 +925,7 @@ #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) || CPU(MIPS64) + #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 -#elif CPU(ARM) || CPU(PPC64) +#elif CPU(ARM) || CPU(PPC64) || CPU(S390X) diff --git a/sources b/sources index ba95771..7405a06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8af09bb297d4c62e64df5418fe99dc9 qtscript-opensource-src-5.2.1.tar.xz +4f755c8810946246adcfbaa74fafae62 qtscript-opensource-src-5.3.0.tar.xz