From 04b25031faa7a8e096cca2d97d4aab95864689e1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 2 Feb 2014 15:28:31 -0600 Subject: [PATCH] Add AArch64 support (RHBUG: 1040452, QTBUG-35528) --- 0001-Add-ARM-64-support.patch | 30 +++++++++++++++++++++++++++++ 0002-Fix-build-on-ARMv8-64bit.patch | 30 +++++++++++++++++++++++++++++ qt5-qtdeclarative.spec | 12 +++++++++++- 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 0001-Add-ARM-64-support.patch create mode 100644 0002-Fix-build-on-ARMv8-64bit.patch diff --git a/0001-Add-ARM-64-support.patch b/0001-Add-ARM-64-support.patch new file mode 100644 index 0000000..761870a --- /dev/null +++ b/0001-Add-ARM-64-support.patch @@ -0,0 +1,30 @@ +From 86c52dab02836843e9e32793768ec5b9b3401049 Mon Sep 17 00:00:00 2001 +From: Florian Loitsch +Date: Wed, 6 Feb 2013 23:10:21 +0100 +Subject: [PATCH] Add ARM 64 support. + +BUG: 33. + +Edited-by: Marcin Juszkiewicz +- only path changed +--- + src/utils.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/utils.h b/src/utils.h +index 767094b..60ad86a 100644 +--- qtdeclarative-opensource-src-5.2.0-rc1.orig/src/3rdparty/double-conversion/utils.h ++++ qtdeclarative-opensource-src-5.2.0-rc1/src/3rdparty/double-conversion/utils.h +@@ -58,7 +58,8 @@ + defined(__mips__) || defined(__powerpc__) || \ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ +- defined(_MIPS_ARCH_MIPS32R2) ++ defined(_MIPS_ARCH_MIPS32R2) || \ ++ defined(_AARCH64EL_) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) +-- +1.8.4.2 + diff --git a/0002-Fix-build-on-ARMv8-64bit.patch b/0002-Fix-build-on-ARMv8-64bit.patch new file mode 100644 index 0000000..5aaa880 --- /dev/null +++ b/0002-Fix-build-on-ARMv8-64bit.patch @@ -0,0 +1,30 @@ +From 4e24bb31bcc76d6d218f3056b4c24a109d367561 Mon Sep 17 00:00:00 2001 +From: Florian Loitsch +Date: Mon, 23 Dec 2013 16:25:45 +0100 +Subject: [PATCH] Fix build on ARMv8 64bit. + +I previously used the wrong variable (_ARCH64EL_ instead of +__ARCH64EL__). + +BUG=33 + +Edited-by: Marcin Juszkiewicz +- path changed +- Changelog part dropped +--- +diff --git a/src/utils.h b/src/utils.h +index c76f77d..c0b8c31 100644 +--- qtdeclarative-opensource-src-5.2.0-rc1.orig/src/3rdparty/double-conversion/utils.h ++++ qtdeclarative-opensource-src-5.2.0-rc1/src/3rdparty/double-conversion/utils.h +@@ -63,7 +63,7 @@ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ +- defined(_AARCH64EL_) ++ defined(__AARCH64EL__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) +-- +1.8.4.2 + diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec index 1478ac1..eb3651f 100644 --- a/qt5-qtdeclarative.spec +++ b/qt5-qtdeclarative.spec @@ -13,7 +13,7 @@ Summary: Qt5 - QtDeclarative component Name: qt5-%{qt_module} Version: 5.2.0 -Release: 5%{?dist} +Release: 6%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -28,6 +28,11 @@ Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/subm # https://codereview.qt-project.org/#change,73710 Patch1: qtdeclarative-opensource-src-5.2.0-no_sse2.patch +# two upstream/upstream fixes from https://code.google.com/p/double-conversion/issues/detail?id=33 +# Qt uses old version of double-conversion code +Patch2: 0001-Add-ARM-64-support.patch +Patch3: 0002-Fix-build-on-ARMv8-64bit.patch + Obsoletes: qt5-qtjsbackend < 5.2.0 BuildRequires: qt5-qtbase-devel >= %{version} @@ -77,6 +82,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}} %patch1 -p1 -b .no_sse2 +%patch2 -p1 -b .0001 +%patch3 -p1 -b .0002 %build @@ -194,6 +201,9 @@ popd %changelog +* Sun Feb 02 2014 Marcin Juszkiewicz 5.2.0-6 +- Add AArch64 support (RHBUG: 1040452, QTBUG-35528) + * Mon Jan 27 2014 Rex Dieter 5.2.0-5 - build -examples only if supported