From 32a2b9e949a5ffcc9ec402f74205b6f3bf6e25c9984c097757295ad9c52d4292 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 14 Dec 2018 19:50:47 +0000 Subject: [PATCH] Accepting request 656553 from KDE:Qt5 Qt 5.12.0 final OBS-URL: https://build.opensuse.org/request/show/656553 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdeclarative?expand=0&rev=50 --- libqt5-qtdeclarative.changes | 71 ++++++++++++++++++++++ libqt5-qtdeclarative.spec | 39 +++++------- qtdeclarative-everywhere-src-5.11.2.tar.xz | 3 - qtdeclarative-everywhere-src-5.12.0.tar.xz | 3 + qtdeclarative-switch-to-python3.patch | 28 +++++---- sse2_nojit.patch | 34 +++++------ 6 files changed, 122 insertions(+), 56 deletions(-) delete mode 100644 qtdeclarative-everywhere-src-5.11.2.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.12.0.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 2927cbb..1d3d82a 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,74 @@ +------------------------------------------------------------------- +Thu Dec 6 13:35:28 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0: + * New feature release + * For more details please see: + * http://code.qt.io/cgit/qt/qtdeclarative.git/plain/dist/changes-5.12.0/?h=v5.12.0 + +------------------------------------------------------------------- +Mon Dec 3 08:16:24 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-rc2: + * New bugfix release + * Only important bugfixes +- Changelog for Qt 5.12.0: + * http://code.qt.io/cgit/qt/qtdeclarative.git/plain/dist/changes-5.12.0/?h=5.12.0 + +------------------------------------------------------------------- +Mon Nov 26 16:45:46 UTC 2018 - Fabian Vogt + +- Remove unneeded BuildReq on Xml modules (boo#1117316) + +------------------------------------------------------------------- +Thu Nov 22 13:38:57 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-rc: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Thu Nov 8 15:24:30 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-beta4: + * New bugfix release + * No changelog available +- New Qt.labs.wavefrontmesh module + +------------------------------------------------------------------- +Fri Oct 26 07:20:23 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-beta3: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Wed Oct 17 08:22:33 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-beta2: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Fri Oct 5 18:57:01 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-beta1: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Tue Oct 2 07:33:22 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.12.0-alpha: + * New feature release + * For more details please see: + * http://wiki.qt.io/New_Features_in_Qt_5.12 +- Refresh patches: + * qtdeclarative-switch-to-python3.patch + * sse2_nojit.patch +- Apply sse2_nojit.patch unconditionally +- Use %license + ------------------------------------------------------------------- Fri Sep 21 07:58:52 UTC 2018 - fabian@ritter-vogt.de diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index f59500d..c5971e0 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -21,17 +21,17 @@ %define libname libQtQuick5 Name: libqt5-qtdeclarative -Version: 5.11.2 +Version: 5.12.0 Release: 0 Summary: Qt 5 Declarative Library License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: Development/Libraries/X11 Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.11.2 -%define so_version 5.11.2 -%define tar_version qtdeclarative-everywhere-src-5.11.2 -Source: https://download.qt.io/official_releases/qt/5.11/%{real_version}/submodules/%{tar_version}.tar.xz +%define real_version 5.12.0 +%define so_version 5.12.0 +%define tar_version qtdeclarative-everywhere-src-5.12.0 +Source: https://download.qt.io/official_releases/qt/5.12/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case Patch100: sse2_nojit.patch @@ -48,8 +48,6 @@ BuildRequires: pkgconfig(Qt5Gui) >= %{version} BuildRequires: pkgconfig(Qt5Network) >= %{version} BuildRequires: pkgconfig(Qt5Sql) >= %{version} BuildRequires: pkgconfig(Qt5Widgets) >= %{version} -BuildRequires: pkgconfig(Qt5Xml) >= %{version} -BuildRequires: pkgconfig(Qt5XmlPatterns) >= %{version} %if %qt5_snapshot #to create the forwarding headers BuildRequires: perl @@ -62,8 +60,6 @@ BuildRequires: xz %requires_ge libQt5Sql5 %requires_ge libQt5Test5 %requires_ge libQt5Widgets5 -%requires_ge libQt5XmlPatterns5 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Qt is a set of libraries for developing applications. @@ -73,10 +69,7 @@ handling. %prep %setup -q -n %{tar_version} -%ifarch %ix86 -%patch100 -p1 -%endif -%patch102 -p1 +%autopatch -p1 %package -n %libname Summary: Qt 5 Declarative Library @@ -206,8 +199,7 @@ popd %fdupes -s %{buildroot}%{_libqt5_examplesdir} %files -n %libname -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt5Q*.so.* %ifarch %ix86 %if 0%{?sle_version:%sle_version} < 150000 @@ -221,26 +213,24 @@ popd %{_libqt5_archdatadir}/qml/QtQml %{_libqt5_archdatadir}/qml/builtins.qmltypes %dir %{_libqt5_archdatadir}/qml/Qt/labs -%{_libqt5_archdatadir}/qml/Qt/labs/folderlistmodel -%{_libqt5_archdatadir}/qml/Qt/labs/handlers/ +%{_libqt5_archdatadir}/qml/Qt/labs/folderlistmodel/ %{_libqt5_archdatadir}/qml/Qt/labs/settings/ %{_libqt5_archdatadir}/qml/Qt/labs/sharedimage/ +%{_libqt5_archdatadir}/qml/Qt/labs/qmlmodels/ +%{_libqt5_archdatadir}/qml/Qt/labs/wavefrontmesh/ %{_libqt5_plugindir}/qmltooling %files private-headers-devel -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_includedir}/Qt*/%{so_version} %files tools -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_bindir}/* %{_libqt5_bindir}/* %files devel -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %exclude %{_libqt5_includedir}/Qt*/%{so_version} %{_libqt5_includedir}/Qt* %{_libqt5_libdir}/cmake/Qt5* @@ -254,8 +244,7 @@ popd %{_libqt5_archdatadir}/qml/QtTest %files examples -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_examplesdir}/ %changelog diff --git a/qtdeclarative-everywhere-src-5.11.2.tar.xz b/qtdeclarative-everywhere-src-5.11.2.tar.xz deleted file mode 100644 index d32079f..0000000 --- a/qtdeclarative-everywhere-src-5.11.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:220d86f8031e9d45f3c369c3fd517aaa4c5783ad62c843a21fa7cc3c0a36f2cd -size 22217460 diff --git a/qtdeclarative-everywhere-src-5.12.0.tar.xz b/qtdeclarative-everywhere-src-5.12.0.tar.xz new file mode 100644 index 0000000..d5c3f73 --- /dev/null +++ b/qtdeclarative-everywhere-src-5.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ffd58102b5714ae058f91cc31511f1c928978f77f01652beb9ce2352a4c227b +size 20436712 diff --git a/qtdeclarative-switch-to-python3.patch b/qtdeclarative-switch-to-python3.patch index 795b9ee..e52028d 100644 --- a/qtdeclarative-switch-to-python3.patch +++ b/qtdeclarative-switch-to-python3.patch @@ -1,8 +1,10 @@ Subject: Make qtdeclarative build with python3 From: Max Lin From: Antonio Larrosa ---- a/qtdeclarative.pro -+++ b/qtdeclarative.pro +Index: qtdeclarative-everywhere-src-5.12.0-alpha/qtdeclarative.pro +=================================================================== +--- qtdeclarative-everywhere-src-5.12.0-alpha.orig/qtdeclarative.pro ++++ qtdeclarative-everywhere-src-5.12.0-alpha/qtdeclarative.pro @@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need load(qt_parts) @@ -12,8 +14,10 @@ From: Antonio Larrosa !equals(py_out, 1): error("Building QtQml requires Python.") tmp = python_available CONFIG += $$tmp ---- a/src/3rdparty/masm/masm.pri -+++ b/src/3rdparty/masm/masm.pri +Index: qtdeclarative-everywhere-src-5.12.0-alpha/src/3rdparty/masm/masm.pri +=================================================================== +--- qtdeclarative-everywhere-src-5.12.0-alpha.orig/src/3rdparty/masm/masm.pri ++++ qtdeclarative-everywhere-src-5.12.0-alpha/src/3rdparty/masm/masm.pri @@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) { udis86.output = udis86_itab.h udis86.input = ITAB @@ -23,8 +27,8 @@ From: Antonio Larrosa QMAKE_EXTRA_COMPILERS += udis86 udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c -@@ -110,7 +110,7 @@ retgen.output = $$GENERATEDDIR/RegExpJit - retgen.script = $$PWD/create_regex_tables +@@ -113,7 +113,7 @@ retgen.output = $$GENERATEDDIR/RegExpJit + retgen.script = $$PWD/yarr/create_regex_tables retgen.input = retgen.script retgen.CONFIG += no_link -retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} @@ -32,8 +36,10 @@ From: Antonio Larrosa QMAKE_EXTRA_COMPILERS += retgen # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf ---- a/src/3rdparty/masm/disassembler/udis86/itab.py -+++ b/src/3rdparty/masm/disassembler/udis86/itab.py +Index: qtdeclarative-everywhere-src-5.12.0-alpha/src/3rdparty/masm/disassembler/udis86/itab.py +=================================================================== +--- qtdeclarative-everywhere-src-5.12.0-alpha.orig/src/3rdparty/masm/disassembler/udis86/itab.py ++++ qtdeclarative-everywhere-src-5.12.0-alpha/src/3rdparty/masm/disassembler/udis86/itab.py @@ -268,13 +268,13 @@ class UdItabGenerator( ud_opcode.UdOpcod opr = e[ 'operands' ] for i in range(len(opr)): @@ -50,10 +56,10 @@ From: Antonio Larrosa pfx_c.append( self.PrefixDict[p] ) if len(e['prefixes']) == 0: pfx_c.append( "P_none" ) -Index: qtdeclarative-opensource-src-5.9.4/src/3rdparty/masm/disassembler/udis86/ud_optable.py +Index: qtdeclarative-everywhere-src-5.12.0-alpha/src/3rdparty/masm/disassembler/udis86/ud_optable.py =================================================================== ---- qtdeclarative-opensource-src-5.9.4.orig/src/3rdparty/masm/disassembler/udis86/ud_optable.py -+++ qtdeclarative-opensource-src-5.9.4/src/3rdparty/masm/disassembler/udis86/ud_optable.py +--- qtdeclarative-everywhere-src-5.12.0-alpha.orig/src/3rdparty/masm/disassembler/udis86/ud_optable.py ++++ qtdeclarative-everywhere-src-5.12.0-alpha/src/3rdparty/masm/disassembler/udis86/ud_optable.py @@ -50,7 +50,7 @@ class UdOptableXmlParser: elif def_node.localName == 'vendor': ven = ( def_node.firstChild.data ); diff --git a/sse2_nojit.patch b/sse2_nojit.patch index c78e8b0..7e184c0 100644 --- a/sse2_nojit.patch +++ b/sse2_nojit.patch @@ -1,8 +1,8 @@ -diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri -index c27aaa9..05c86e8 100644 ---- a/src/qml/jsruntime/jsruntime.pri -+++ b/src/qml/jsruntime/jsruntime.pri -@@ -115,6 +115,11 @@ SOURCES += \ +Index: qtdeclarative-everywhere-src-5.12.0-alpha/src/qml/jsruntime/jsruntime.pri +=================================================================== +--- qtdeclarative-everywhere-src-5.12.0-alpha.orig/src/qml/jsruntime/jsruntime.pri ++++ qtdeclarative-everywhere-src-5.12.0-alpha/src/qml/jsruntime/jsruntime.pri +@@ -154,6 +154,11 @@ SOURCES += \ $$PWD/qv4value.cpp \ $$PWD/qv4executableallocator.cpp @@ -14,11 +14,11 @@ index c27aaa9..05c86e8 100644 valgrind { DEFINES += V4_USE_VALGRIND } -diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h -index a58beb3..85e8dc0 100644 ---- a/src/qml/jsruntime/qv4global_p.h -+++ b/src/qml/jsruntime/qv4global_p.h -@@ -117,7 +117,7 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } +Index: qtdeclarative-everywhere-src-5.12.0-alpha/src/qml/jsruntime/qv4global_p.h +=================================================================== +--- qtdeclarative-everywhere-src-5.12.0-alpha.orig/src/qml/jsruntime/qv4global_p.h ++++ qtdeclarative-everywhere-src-5.12.0-alpha/src/qml/jsruntime/qv4global_p.h +@@ -115,7 +115,7 @@ inline double trunc(double d) { return d // Black list some platforms #if defined(V4_ENABLE_JIT) @@ -27,16 +27,16 @@ index a58beb3..85e8dc0 100644 # undef V4_ENABLE_JIT #endif #endif -diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp -index 39b816f..762ee61 100644 ---- a/src/qml/qml/v8/qv8engine.cpp -+++ b/src/qml/qml/v8/qv8engine.cpp -@@ -131,7 +131,7 @@ QV8Engine::QV8Engine(QJSEngine* qq) - { +Index: qtdeclarative-everywhere-src-5.12.0-alpha/src/qml/qml/v8/qv8engine.cpp +=================================================================== +--- qtdeclarative-everywhere-src-5.12.0-alpha.orig/src/qml/qml/v8/qv8engine.cpp ++++ qtdeclarative-everywhere-src-5.12.0-alpha/src/qml/qml/v8/qv8engine.cpp +@@ -141,7 +141,7 @@ QV8Engine::QV8Engine(QV4::ExecutionEngin + #ifndef Q_OS_WASM // wasm does not have working simd QTBUG-63924 #ifdef Q_PROCESSOR_X86_32 if (!qCpuHasFeature(SSE2)) { - qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer"); + qDebug("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer, processors missing the extension are NOT supported to run QML2 code!"); } #endif - + #endif