Attachment 844961 Details for Bug 1040452 – complete fix

[patch] complete fix

0001-Add-AArch64-support.-QTBUG-35528-RHBUG-1040452.patch (text/plain), 4.40 KB, created by Marcin Juszkiewicz on 2014-01-03 14:26:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Juszkiewicz

Created: 2014-01-03 14:26:30 UTC

Size: 4.40 KB

patch

obsolete

>From 114e21748394eb7cbe67da720e4d74117504f2df Mon Sep 17 00:00:00 2001
>From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
>Date: Mon, 16 Dec 2013 09:51:45 +0100
>Subject: [PATCH] Add AArch64 support. QTBUG-35528 RHBUG: 1040452
>
>Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
>---
> 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 <floitsch@google.com>
>+Date: Wed, 6 Feb 2013 23:10:21 +0100
>+Subject: [PATCH] Add ARM 64 support.
>+
>+BUG: 33.
>+
>+Edited-by: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
>+- 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 <florian@loitsch.com>
>+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 <mjuszkiewicz@redhat.com>
>+- 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 95ed6ab..23749ac 100644
>--- a/qt5-qtdeclarative.spec
>+++ b/qt5-qtdeclarative.spec
>@@ -11,7 +11,7 @@
> Summary: Qt5 - QtDeclarative component
> Name:    qt5-%{qt_module}
> Version: 5.2.0
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> 
> # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
> License: LGPLv2 with exceptions or GPLv3 with exceptions
>@@ -26,6 +26,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}
>@@ -66,6 +71,8 @@ BuildArch: noarch
> %setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}
> 
> %patch1 -p1 -b .no_sse2
>+%patch2 -p1
>+%patch3 -p1
> 
> 
> %build
>@@ -178,6 +185,9 @@ popd
> 
> 
> %changelog
>+* Mon Dec 16 2013 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> 5.2.0-2
>+- Add AArch64 support. QTBUG-35528 RHBUG: 1040452
>+
> * Thu Dec 12 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-1
> - 5.2.0
> 
>-- 
>1.8.4.2
>

Actions: View | Diff

Attachments on bug 1040452: 835275 | 844961