diff --git a/.gitignore b/.gitignore index a7ec315..7d58dc8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qtdeclarative-opensource-src-5.2.1.tar.xz +/qtdeclarative-opensource-src-5.3.0.tar.xz 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 -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 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 -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 50fe116..f1c9ad6 100644 --- a/qt5-qtdeclarative.spec +++ b/qt5-qtdeclarative.spec @@ -12,27 +12,22 @@ Summary: Qt5 - QtDeclarative component Name: qt5-%{qt_module} -Version: 5.2.1 +Version: 5.3.0 Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for 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 # 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} @@ -82,8 +77,6 @@ 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 @@ -162,6 +155,7 @@ popd %{_qt5_libdir}/sse2/libQt5Qml.so.5* %endif %{_qt5_libdir}/libQt5Quick.so.5* +%{_qt5_libdir}/libQt5QuickWidgets.so.5* %{_qt5_libdir}/libQt5QuickParticles.so.5* %{_qt5_libdir}/libQt5QuickTest.so.5* %{_qt5_plugindir}/accessible/libqtaccessiblequick.so @@ -175,6 +169,7 @@ popd %{_qt5_libdir}/libQt5Qml.so %{_qt5_libdir}/libQt5Qml.prl %{_qt5_libdir}/libQt5Quick*.so +%{_qt5_libdir}/libQt5QuickWidgets.so.5 %{_qt5_libdir}/libQt5Quick*.prl %{_qt5_libdir}/cmake/Qt5*/ %{_qt5_libdir}/pkgconfig/Qt5*.pc @@ -190,8 +185,6 @@ popd %{_qt5_docdir}/qtqml/ %{_qt5_docdir}/qtquick.qch %{_qt5_docdir}/qtquick/ -%{_qt5_docdir}/qtquickdialogs.qch -%{_qt5_docdir}/qtquickdialogs/ %endif %if 0%{?_qt5_examplesdir:1} @@ -201,6 +194,9 @@ popd %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/qtdeclarative-opensource-src-5.2.0-no_sse2.patch b/qtdeclarative-opensource-src-5.2.0-no_sse2.patch index 928eea9..1a5f550 100644 --- a/qtdeclarative-opensource-src-5.2.0-no_sse2.patch +++ b/qtdeclarative-opensource-src-5.2.0-no_sse2.patch @@ -1,7 +1,8 @@ -diff -up qtdeclarative-opensource-src-5.2.0/src/qml/jsruntime/jsruntime.pri.no_sse2 qtdeclarative-opensource-src-5.2.0/src/qml/jsruntime/jsruntime.pri ---- qtdeclarative-opensource-src-5.2.0/src/qml/jsruntime/jsruntime.pri.no_sse2 2013-12-08 11:10:19.000000000 -0600 -+++ qtdeclarative-opensource-src-5.2.0/src/qml/jsruntime/jsruntime.pri 2013-12-12 11:30:36.763009499 -0600 -@@ -91,7 +91,7 @@ HEADERS += \ +diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri +index 72010d3..2bd5acb 100644 +--- a/src/qml/jsruntime/jsruntime.pri ++++ b/src/qml/jsruntime/jsruntime.pri +@@ -107,7 +107,7 @@ SOURCES += \ # Use SSE2 floating point math on 32 bit instead of the default # 387 to make test results pass on 32 and on 64 bit builds. @@ -10,19 +11,11 @@ diff -up qtdeclarative-opensource-src-5.2.0/src/qml/jsruntime/jsruntime.pri.no_s QMAKE_CFLAGS += -march=pentium4 -msse2 -mfpmath=sse QMAKE_CXXFLAGS += -march=pentium4 -msse2 -mfpmath=sse } -diff -up qtdeclarative-opensource-src-5.2.0/src/qml/jsruntime/qv4global_p.h.no_sse2 qtdeclarative-opensource-src-5.2.0/src/qml/jsruntime/qv4global_p.h ---- qtdeclarative-opensource-src-5.2.0/src/qml/jsruntime/qv4global_p.h.no_sse2 2013-12-08 11:10:19.000000000 -0600 -+++ qtdeclarative-opensource-src-5.2.0/src/qml/jsruntime/qv4global_p.h 2013-12-12 11:32:21.555865718 -0600 -@@ -45,6 +45,8 @@ - #include - #include - #include -+// To get __SSE2__ defined when building with MSVC -+//#include - - #if defined(Q_CC_MSVC) - #include -@@ -70,7 +72,7 @@ inline double trunc(double d) { return d +diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h +index b5dc674..97e9ae6 100644 +--- a/src/qml/jsruntime/qv4global_p.h ++++ b/src/qml/jsruntime/qv4global_p.h +@@ -75,7 +75,7 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } // White list architectures diff --git a/sources b/sources index 81ea2d8..c0a2d7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a23fba03a4b48f36fe8b51d326d08acc qtdeclarative-opensource-src-5.2.1.tar.xz +9e29d2b481c771ce5c798a3319835673 qtdeclarative-opensource-src-5.3.0.tar.xz