From 2d0d4e704ef61ea05c1c07f57d181e2333b1c558 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 8 May 2017 16:10:09 +0200 Subject: [PATCH] - drop useless qtdeclarative-opensource-src-5.9.0-v4bootstrap.patch, apply correct qtdeclarative-opensource-src-5.9.0-no_sse2.patch to fix the build issue in JIT on ppc64/ppc64le/s390x --- qt5-qtdeclarative.spec | 9 ++++--- ...ive-opensource-src-5.9.0-v4bootstrap.patch | 24 ------------------- 2 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 qtdeclarative-opensource-src-5.9.0-v4bootstrap.patch diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec index 93be213..70572e3 100644 --- a/qt5-qtdeclarative.spec +++ b/qt5-qtdeclarative.spec @@ -10,7 +10,7 @@ Summary: Qt5 - QtDeclarative component Name: qt5-%{qt_module} Version: 5.9.0 -Release: 0.beta.3%{?dist} +Release: 0.beta.4%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -25,7 +25,6 @@ Patch1: qtdeclarative-opensource-src-5.9.0-no_sse2.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1237269 # https://bugs.kde.org/show_bug.cgi?id=348385 Patch2: qtdeclarative-QQuickShaderEffectSource_deadlock.patch -Patch3: qtdeclarative-opensource-src-5.9.0-v4bootstrap.patch ## upstream patches @@ -87,7 +86,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %patch1 -p1 -b .no_sse2 %endif %patch2 -p1 -b .QQuickShaderEffectSource_deadlock -%patch3 -p1 -b .v5boot %patch201 -p0 -b .kdebug346118 %patch202 -p1 -b .nojitsupport @@ -212,6 +210,11 @@ make check -k -C %{_target_platform}/tests ||: %{_qt5_examplesdir}/ %changelog +* Mon May 08 2017 Than Ngo - 5.9.0-0.beta.4 +- drop useless qtdeclarative-opensource-src-5.9.0-v4bootstrap.patch, + apply correct qtdeclarative-opensource-src-5.9.0-no_sse2.patch to + fix the build issue in JIT on ppc64/ppc64le/s390x + * Fri May 05 2017 Helio Chissini de Castro - 5.9.0-0.beta.3 - New upstream beta3 release diff --git a/qtdeclarative-opensource-src-5.9.0-v4bootstrap.patch b/qtdeclarative-opensource-src-5.9.0-v4bootstrap.patch deleted file mode 100644 index 3d0e9fe..0000000 --- a/qtdeclarative-opensource-src-5.9.0-v4bootstrap.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- qtdeclarative-opensource-src-5.9.0-beta3/tools/qmlcachegen/qmlcachegen.cpp 2017-04-21 20:34:05.000000000 +0200 -+++ qtdeclarative-opensource-src-5.9.0-beta3/tools/qmlcachegen/qmlcachegen.cpp.new 2017-05-06 15:20:22.055698824 +0200 -@@ -41,9 +41,11 @@ - - QT_BEGIN_NAMESPACE - -+#if defined(V4_BOOTSTRAP) - namespace QV4 { namespace JIT { - Q_QML_EXPORT QV4::EvalISelFactory *createISelForArchitecture(const QString &architecture); - } } -+#endif - - QT_END_NAMESPACE - -@@ -327,7 +329,9 @@ - QScopedPointer isel; - const QString targetArchitecture = parser.value(targetArchitectureOption); - -+#if defined(V4_BOOTSTRAP) - isel.reset(QV4::JIT::createISelForArchitecture(targetArchitecture)); -+#endif - - if (parser.isSet(checkIfSupportedOption)) { - if (isel.isNull())