Attachment 876605 Details for Bug 1078524 – Use system double-conversion instead of bundled one

[patch] Use system double-conversion instead of bundled one

Use-system-double-conversion-instead-of-bundled-on.patch (text/plain), 7.18 KB, created by Ville Skyttä on 2014-03-19 20:05:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-19 20:05:19 UTC

Size: 7.18 KB

patch

obsolete

>From 21f5a11c8dd5c79599b3fc3af87da4c256a48275 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Wed, 19 Mar 2014 22:04:09 +0200
>Subject: [PATCH] Use system double-conversion instead of bundled one
>
>---
> 0001-Add-ARM-64-support.patch                      | 30 --------------------
> 0002-Fix-build-on-ARMv8-64bit.patch                | 30 --------------------
> qt5-qtdeclarative.spec                             | 16 +++++------
> ...ve-opensource-src-5.2.1-system-doubleconv.patch | 33 ++++++++++++++++++++++
> 4 files changed, 41 insertions(+), 68 deletions(-)
> delete mode 100644 0001-Add-ARM-64-support.patch
> delete mode 100644 0002-Fix-build-on-ARMv8-64bit.patch
> create mode 100644 qtdeclarative-opensource-src-5.2.1-system-doubleconv.patch
>
>diff --git a/0001-Add-ARM-64-support.patch b/0001-Add-ARM-64-support.patch
>deleted file mode 100644
>index 761870a..0000000
>--- a/0001-Add-ARM-64-support.patch
>+++ /dev/null
>@@ -1,30 +0,0 @@
>-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
>deleted file mode 100644
>index 5aaa880..0000000
>--- a/0002-Fix-build-on-ARMv8-64bit.patch
>+++ /dev/null
>@@ -1,30 +0,0 @@
>-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 50fe116..116a0e0 100644
>--- a/qt5-qtdeclarative.spec
>+++ b/qt5-qtdeclarative.spec
>@@ -13,7 +13,7 @@
> Summary: Qt5 - QtDeclarative component
> Name:    qt5-%{qt_module}
> Version: 5.2.1
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> 
> # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
> License: LGPLv2 with exceptions or GPLv3 with exceptions
>@@ -24,15 +24,11 @@ Source0: http://download.qt-project.org/development_releases/qt/5.2/%{version}-%
> Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
> %endif
> 
>+Patch0: qtdeclarative-opensource-src-5.2.1-system-doubleconv.patch
> # support no_sse2 CONFIG (fedora i686 builds cannot assume -march=pentium4 -msse2 -mfpmath=sse flags, or the JIT that needs them)
> # 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}
>@@ -40,6 +36,7 @@ BuildRequires: qt5-qtbase-devel >= %{version}
> BuildRequires: pkgconfig(Qt5XmlPatterns)
> %endif
> BuildRequires: python
>+BuildRequires: double-conversion-devel
> 
> %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
> 
>@@ -80,10 +77,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
> 
> %prep
> %setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}
>+rm -r src/3rdparty/double-conversion
> 
>+%patch0 -p1 -b .system-doubleconv
> %patch1 -p1 -b .no_sse2
>-%patch2 -p1 -b .0001
>-%patch3 -p1 -b .0002
> 
> 
> %build
>@@ -201,6 +198,9 @@ popd
> 
> 
> %changelog
>+* Wed Mar 19 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 5.2.1-2
>+- Use system double-conversion instead of bundled one
>+
> * Wed Feb 05 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.1-1
> - 5.2.1
> 
>diff --git a/qtdeclarative-opensource-src-5.2.1-system-doubleconv.patch b/qtdeclarative-opensource-src-5.2.1-system-doubleconv.patch
>new file mode 100644
>index 0000000..e0fc3ed
>--- /dev/null
>+++ b/qtdeclarative-opensource-src-5.2.1-system-doubleconv.patch
>@@ -0,0 +1,33 @@
>+diff -up qtdeclarative-opensource-src-5.2.1/src/qml/jsruntime/jsruntime.pri~ qtdeclarative-opensource-src-5.2.1/src/qml/jsruntime/jsruntime.pri
>+--- qtdeclarative-opensource-src-5.2.1/src/qml/jsruntime/jsruntime.pri~	2014-03-19 21:31:43.031088489 +0200
>++++ qtdeclarative-opensource-src-5.2.1/src/qml/jsruntime/jsruntime.pri	2014-03-19 21:39:24.337915629 +0200
>+@@ -102,4 +102,4 @@ valgrind {
>+ 
>+ ios: DEFINES += ENABLE_ASSEMBLER_WX_EXCLUSIVE=1
>+ 
>+-include(../../3rdparty/double-conversion/double-conversion.pri)
>++LIBS += -ldouble-conversion
>+diff -up qtdeclarative-opensource-src-5.2.1/src/qml/jsruntime/qv4numberobject.cpp~ qtdeclarative-opensource-src-5.2.1/src/qml/jsruntime/qv4numberobject.cpp
>+--- qtdeclarative-opensource-src-5.2.1/src/qml/jsruntime/qv4numberobject.cpp~	2014-02-01 22:38:02.000000000 +0200
>++++ qtdeclarative-opensource-src-5.2.1/src/qml/jsruntime/qv4numberobject.cpp	2014-03-19 21:52:20.095347359 +0200
>+@@ -44,7 +44,7 @@
>+ #include <QtCore/qmath.h>
>+ #include <QtCore/QDebug>
>+ #include <cassert>
>+-#include <double-conversion.h>
>++#include <double-conversion/double-conversion.h>
>+ 
>+ using namespace QV4;
>+ 
>+diff -up qtdeclarative-opensource-src-5.2.1/src/qml/jsruntime/qv4runtime.cpp~ qtdeclarative-opensource-src-5.2.1/src/qml/jsruntime/qv4runtime.cpp
>+--- qtdeclarative-opensource-src-5.2.1/src/qml/jsruntime/qv4runtime.cpp~	2014-02-01 22:38:02.000000000 +0200
>++++ qtdeclarative-opensource-src-5.2.1/src/qml/jsruntime/qv4runtime.cpp	2014-03-19 21:52:40.587779477 +0200
>+@@ -63,7 +63,7 @@
>+ #include <typeinfo>
>+ #include <stdlib.h>
>+ 
>+-#include "../../../3rdparty/double-conversion/double-conversion.h"
>++#include <double-conversion/double-conversion.h>
>+ 
>+ QT_BEGIN_NAMESPACE
>+ 
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1078524: 876605