diff --git a/qt5-qtscript.spec b/qt5-qtscript.spec index b93bba8..b60477c 100644 --- a/qt5-qtscript.spec +++ b/qt5-qtscript.spec @@ -4,7 +4,7 @@ Summary: Qt5 - QtScript component Name: qt5-%{qt_module} Version: 5.2.0 -Release: 2%{?dist} +Release: 3%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -18,6 +18,10 @@ Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/subm # 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 @@ -54,6 +58,7 @@ 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 @@ -108,6 +113,9 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la %changelog +* Sun Feb 02 2014 Rex Dieter 5.2.0-3 +- Add AArch64 support to qtscript (#1056071) + * Mon Jan 27 2014 Rex Dieter 5.2.0-2 - -examples subpkg - -doc for all archs diff --git a/qtscript-opensource-src-5.2.0-aarch64.patch b/qtscript-opensource-src-5.2.0-aarch64.patch new file mode 100644 index 0000000..ed3eb4d --- /dev/null +++ b/qtscript-opensource-src-5.2.0-aarch64.patch @@ -0,0 +1,27 @@ +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