From f024e2d1957208663eefd03f50caca850419f850e6f83681734951e6a17ffec7 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 30 Sep 2019 13:17:44 +0000 Subject: [PATCH 1/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtdeclarative?expand=0&rev=1 --- libqt5-qtdeclarative.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 28234b9..4306283 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -189,6 +189,8 @@ Tue May 22 15:18:09 CEST 2018 - fabian@ritter-vogt.de * New bugfix release * For more details please see: * http://code.qt.io/cgit/qt/qtdeclarative.git/plain/dist/changes-5.11.0/?h=v5.11.0 +- Includes fix for various issues with the JS/QML Date object + (boo#1114570, QTBUG-72109, QTBUG-56787) ------------------------------------------------------------------- Tue May 8 10:59:23 CEST 2018 - fabian@ritter-vogt.de From c335d67678def7c34c7e2e6f6ef4f63658e6dceaa00deb6dfe5295183d982fdd Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 5 Oct 2019 16:00:54 +0000 Subject: [PATCH 2/7] Accepting request 734738 from home:Vogtinator:qt5.14 Qt 5.14 Alpha OBS-URL: https://build.opensuse.org/request/show/734738 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtdeclarative?expand=0&rev=2 --- libqt5-qtdeclarative.changes | 11 +++ libqt5-qtdeclarative.spec | 15 +++-- qtdeclarative-everywhere-src-5.13.1.tar.xz | 3 - ...arative-everywhere-src-5.14.0-alpha.tar.xz | 3 + sse2_nojit.patch | 67 ++++++++++--------- 5 files changed, 57 insertions(+), 42 deletions(-) delete mode 100644 qtdeclarative-everywhere-src-5.13.1.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.14.0-alpha.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 4306283..62908ba 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Sep 30 13:30:01 UTC 2019 - Fabian Vogt + +- Update to 5.14.0-alpha: + * New feature release + * No changelog available + * For more details about Qt 5.14 please see: + https://wiki.qt.io/New_Features_in_Qt_5.14 +- Refresh sse2_nojit.patch: + * Basically a rewrite, needed for the new config system + ------------------------------------------------------------------- Fri Sep 6 08:03:38 UTC 2019 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index 3c10b7f..3abcf74 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -21,17 +21,17 @@ %define libname libQtQuick5 Name: libqt5-qtdeclarative -Version: 5.13.1 +Version: 5.14.0~alpha 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.13.1 -%define so_version 5.13.1 -%define tar_version qtdeclarative-everywhere-src-5.13.1 -Source: https://download.qt.io/official_releases/qt/5.13/%{real_version}/submodules/%{tar_version}.tar.xz +%define real_version 5.14.0-alpha +%define so_version 5.14.0 +%define tar_version qtdeclarative-everywhere-src-5.14.0-alpha +Source: https://download.qt.io/development_releases/qt/5.14/%{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 @@ -142,7 +142,7 @@ mkdir .git mkdir -p %{_target_platform} pushd %{_target_platform} -qmake-qt5 .. +qmake-qt5 .. -- -qml-jit popd %{__make} %{?_smp_mflags} VERBOSE=1 -C %{_target_platform} @@ -152,7 +152,7 @@ popd # build libQt5Qml with no_sse2 mkdir -p %{_target_platform}-no_sse2 pushd %{_target_platform}-no_sse2 -%qmake5 -config no_sse2 .. +%qmake5 -config no_sse2 .. -- -no-qml-jit make sub-src-clean %{__make} %{?_smp_mflags} VERBOSE=1 -C src/qml popd @@ -214,6 +214,7 @@ popd %{_libqt5_archdatadir}/qml/QtQml %{_libqt5_archdatadir}/qml/builtins.qmltypes %dir %{_libqt5_archdatadir}/qml/Qt/labs +%{_libqt5_archdatadir}/qml/Qt/labs/animation/ %{_libqt5_archdatadir}/qml/Qt/labs/folderlistmodel/ %{_libqt5_archdatadir}/qml/Qt/labs/settings/ %{_libqt5_archdatadir}/qml/Qt/labs/sharedimage/ diff --git a/qtdeclarative-everywhere-src-5.13.1.tar.xz b/qtdeclarative-everywhere-src-5.13.1.tar.xz deleted file mode 100644 index 4ae98fe..0000000 --- a/qtdeclarative-everywhere-src-5.13.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae3477401b13d6b31e8569629d3f73b3e81e27cec27595988ffd320eaec7f0e2 -size 20918916 diff --git a/qtdeclarative-everywhere-src-5.14.0-alpha.tar.xz b/qtdeclarative-everywhere-src-5.14.0-alpha.tar.xz new file mode 100644 index 0000000..7a4627c --- /dev/null +++ b/qtdeclarative-everywhere-src-5.14.0-alpha.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0ef5a219ddfc3df7daf6e423120743bf52991958a98a0f38dcc18c47006c415 +size 21584756 diff --git a/sse2_nojit.patch b/sse2_nojit.patch index 9f7d6fe..e4a3404 100644 --- a/sse2_nojit.patch +++ b/sse2_nojit.patch @@ -1,42 +1,45 @@ -Index: qtdeclarative-everywhere-src-5.13.0-beta1/src/qml/jsruntime/jsruntime.pri +From: Fabian Vogt +Subject: Allow building with and without JIT on i586 + +For i586, the default Qt does not have sse2 enabled, but for sse2 capable systems +we'd like to have it use the JIT. Do some patching in the configuration system +to allow toggling it from the qmake call. + +Originally written by Wolfgang Bauer + +Index: qtdeclarative-everywhere-src-5.14.0-alpha/src/qml/jsruntime/jsruntime.pri =================================================================== ---- qtdeclarative-everywhere-src-5.13.0-beta1.orig/src/qml/jsruntime/jsruntime.pri -+++ qtdeclarative-everywhere-src-5.13.0-beta1/src/qml/jsruntime/jsruntime.pri -@@ -174,6 +174,11 @@ qmldevtools_build { +--- qtdeclarative-everywhere-src-5.14.0-alpha.orig/src/qml/jsruntime/jsruntime.pri ++++ qtdeclarative-everywhere-src-5.14.0-alpha/src/qml/jsruntime/jsruntime.pri +@@ -164,6 +164,10 @@ win32 { + $$PWD/qv4functiontable_unix.cpp } - +linux-g++*:isEqual(QT_ARCH,i386):!no_sse2 { + QMAKE_CFLAGS += -msse2 -mfpmath=sse + QMAKE_CXXFLAGS += -msse2 -mfpmath=sse +} -+ + valgrind { DEFINES += V4_USE_VALGRIND - } -Index: qtdeclarative-everywhere-src-5.13.0-beta1/src/qml/jsruntime/qv4global_p.h +Index: qtdeclarative-everywhere-src-5.14.0-alpha/src/qml/configure.json =================================================================== ---- qtdeclarative-everywhere-src-5.13.0-beta1.orig/src/qml/jsruntime/qv4global_p.h -+++ qtdeclarative-everywhere-src-5.13.0-beta1/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) --#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) -+#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) || (defined(Q_PROCESSOR_X86) && !defined(__SSE2__)) - # undef V4_ENABLE_JIT - #endif - #endif -Index: qtdeclarative-everywhere-src-5.13.0-beta1/src/qml/qml/v8/qv8engine.cpp -=================================================================== ---- qtdeclarative-everywhere-src-5.13.0-beta1.orig/src/qml/qml/v8/qv8engine.cpp -+++ qtdeclarative-everywhere-src-5.13.0-beta1/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 +--- qtdeclarative-everywhere-src-5.14.0-alpha.orig/src/qml/configure.json ++++ qtdeclarative-everywhere-src-5.14.0-alpha/src/qml/configure.json +@@ -8,6 +8,7 @@ + "commandline": { + "options": { + "qml-network": "boolean", ++ "qml-jit": "boolean", + "qml-debug": "boolean" + } + }, +@@ -90,7 +91,7 @@ + "purpose": "Provides a JIT for QML and JavaScript", + "section": "QML", + "condition": [ +- " (arch.i386 && tests.pointer_32bit && features.sse2) ++ " (arch.i386 && tests.pointer_32bit) + || (arch.x86_64 && tests.pointer_64bit && features.sse2) + || (arch.arm && tests.pointer_32bit && tests.arm_fp && tests.arm_thumb + && (config.linux || config.ios || config.tvos || config.qnx)) From db5432c03aac560dba5a2792d9f31be0f4ea156c356b697c4b137eb764a36968 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 28 Oct 2019 17:53:54 +0000 Subject: [PATCH 3/7] Accepting request 743230 from home:Vogtinator:qt5.14 Qt 5.14.0 Beta 2 OBS-URL: https://build.opensuse.org/request/show/743230 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtdeclarative?expand=0&rev=3 --- libqt5-qtdeclarative.changes | 14 ++++++++++++++ libqt5-qtdeclarative.spec | 6 +++--- qtdeclarative-everywhere-src-5.14.0-alpha.tar.xz | 3 --- qtdeclarative-everywhere-src-5.14.0-beta2.tar.xz | 3 +++ 4 files changed, 20 insertions(+), 6 deletions(-) delete mode 100644 qtdeclarative-everywhere-src-5.14.0-alpha.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.14.0-beta2.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 62908ba..3bc3001 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Oct 24 13:22:31 UTC 2019 - Fabian Vogt + +- Update to 5.14.0-beta2: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Tue Oct 15 12:34:25 UTC 2019 - Fabian Vogt + +- Update to 5.14.0-beta1: + * New bugfix release + * No changelog available + ------------------------------------------------------------------- Mon Sep 30 13:30:01 UTC 2019 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index 3abcf74..56e1237 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -21,16 +21,16 @@ %define libname libQtQuick5 Name: libqt5-qtdeclarative -Version: 5.14.0~alpha +Version: 5.14.0~beta2 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.14.0-alpha +%define real_version 5.14.0-beta2 %define so_version 5.14.0 -%define tar_version qtdeclarative-everywhere-src-5.14.0-alpha +%define tar_version qtdeclarative-everywhere-src-5.14.0-beta2 Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case diff --git a/qtdeclarative-everywhere-src-5.14.0-alpha.tar.xz b/qtdeclarative-everywhere-src-5.14.0-alpha.tar.xz deleted file mode 100644 index 7a4627c..0000000 --- a/qtdeclarative-everywhere-src-5.14.0-alpha.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0ef5a219ddfc3df7daf6e423120743bf52991958a98a0f38dcc18c47006c415 -size 21584756 diff --git a/qtdeclarative-everywhere-src-5.14.0-beta2.tar.xz b/qtdeclarative-everywhere-src-5.14.0-beta2.tar.xz new file mode 100644 index 0000000..96c4ce9 --- /dev/null +++ b/qtdeclarative-everywhere-src-5.14.0-beta2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de173eeb59e4823d850e2c19a0c9d2a9de3415ba4350d716837c562109df6f3b +size 21603088 From df93056ad0a6fe94ab27ade067265c3ccba03c4a5dca3b477a3998801a63e6db Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 14 Nov 2019 08:34:36 +0000 Subject: [PATCH 4/7] Accepting request 748159 from home:Vogtinator:qt5.14 Qt 5.14 Beta 3 OBS-URL: https://build.opensuse.org/request/show/748159 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtdeclarative?expand=0&rev=4 --- libqt5-qtdeclarative.changes | 7 +++++++ libqt5-qtdeclarative.spec | 6 +++--- qtdeclarative-everywhere-src-5.14.0-beta2.tar.xz | 3 --- qtdeclarative-everywhere-src-5.14.0-beta3.tar.xz | 3 +++ 4 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 qtdeclarative-everywhere-src-5.14.0-beta2.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.14.0-beta3.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 3bc3001..e5a2c05 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 12 13:00:58 UTC 2019 - Fabian Vogt + +- Update to 5.14.0-beta3: + * New bugfix release + * No changelog available + ------------------------------------------------------------------- Thu Oct 24 13:22:31 UTC 2019 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index 56e1237..5991142 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -21,16 +21,16 @@ %define libname libQtQuick5 Name: libqt5-qtdeclarative -Version: 5.14.0~beta2 +Version: 5.14.0~beta3 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.14.0-beta2 +%define real_version 5.14.0-beta3 %define so_version 5.14.0 -%define tar_version qtdeclarative-everywhere-src-5.14.0-beta2 +%define tar_version qtdeclarative-everywhere-src-5.14.0-beta3 Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case diff --git a/qtdeclarative-everywhere-src-5.14.0-beta2.tar.xz b/qtdeclarative-everywhere-src-5.14.0-beta2.tar.xz deleted file mode 100644 index 96c4ce9..0000000 --- a/qtdeclarative-everywhere-src-5.14.0-beta2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de173eeb59e4823d850e2c19a0c9d2a9de3415ba4350d716837c562109df6f3b -size 21603088 diff --git a/qtdeclarative-everywhere-src-5.14.0-beta3.tar.xz b/qtdeclarative-everywhere-src-5.14.0-beta3.tar.xz new file mode 100644 index 0000000..951b615 --- /dev/null +++ b/qtdeclarative-everywhere-src-5.14.0-beta3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a80da41a45cfbea9d9b08d1c964cb430b61b27f31f91b42772e2570032d22315 +size 21590956 From 8af1ea51d7b5c6365fc383998f431ac87ad7e205df0b3d687af4c84f3e6254c4 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 5 Dec 2019 09:41:12 +0000 Subject: [PATCH 5/7] Accepting request 754286 from home:Vogtinator:qt5.14 Qt 5.14.0 RC1 OBS-URL: https://build.opensuse.org/request/show/754286 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtdeclarative?expand=0&rev=5 --- libqt5-qtdeclarative.changes | 10 ++++++++++ libqt5-qtdeclarative.spec | 6 +++--- qtdeclarative-everywhere-src-5.14.0-beta3.tar.xz | 3 --- qtdeclarative-everywhere-src-5.14.0-rc.tar.xz | 3 +++ 4 files changed, 16 insertions(+), 6 deletions(-) delete mode 100644 qtdeclarative-everywhere-src-5.14.0-beta3.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.14.0-rc.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index e5a2c05..3275ce1 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Dec 4 14:37:36 UTC 2019 - Fabian Vogt + +- Update to 5.14.0-rc: + * New bugfix release + * No changelog available + * For more details please see: + * For more details about Qt 5.14 please see: + https://wiki.qt.io/New_Features_in_Qt_5.14 + ------------------------------------------------------------------- Tue Nov 12 13:00:58 UTC 2019 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index 5991142..40499d1 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -21,16 +21,16 @@ %define libname libQtQuick5 Name: libqt5-qtdeclarative -Version: 5.14.0~beta3 +Version: 5.14.0~rc 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.14.0-beta3 +%define real_version 5.14.0-rc %define so_version 5.14.0 -%define tar_version qtdeclarative-everywhere-src-5.14.0-beta3 +%define tar_version qtdeclarative-everywhere-src-5.14.0-rc Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case diff --git a/qtdeclarative-everywhere-src-5.14.0-beta3.tar.xz b/qtdeclarative-everywhere-src-5.14.0-beta3.tar.xz deleted file mode 100644 index 951b615..0000000 --- a/qtdeclarative-everywhere-src-5.14.0-beta3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a80da41a45cfbea9d9b08d1c964cb430b61b27f31f91b42772e2570032d22315 -size 21590956 diff --git a/qtdeclarative-everywhere-src-5.14.0-rc.tar.xz b/qtdeclarative-everywhere-src-5.14.0-rc.tar.xz new file mode 100644 index 0000000..330243b --- /dev/null +++ b/qtdeclarative-everywhere-src-5.14.0-rc.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2acc5c78c5a38e2a708af0c08c2ca66daca5dad40b75b7e644371b47a6e402aa +size 21253028 From a9deb563e90ca900ab8cca13208c7056b9813a0fae95a8c18662146e5e391d6c Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 12 Dec 2019 20:39:50 +0000 Subject: [PATCH 6/7] Accepting request 756177 from home:Vogtinator:qt5.14 Qt 5.14.0 final - not fully built yet OBS-URL: https://build.opensuse.org/request/show/756177 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtdeclarative?expand=0&rev=6 --- libqt5-qtdeclarative.changes | 10 ++++++++++ libqt5-qtdeclarative.spec | 8 ++++---- qtdeclarative-everywhere-src-5.14.0-rc.tar.xz | 3 --- qtdeclarative-everywhere-src-5.14.0.tar.xz | 3 +++ 4 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 qtdeclarative-everywhere-src-5.14.0-rc.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.14.0.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 3275ce1..263e90f 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Dec 12 12:41:44 UTC 2019 - Fabian Vogt + +- Update to 5.14.0: + * New bugfix release + * For the changes between 5.13.2 and 5.14.0 please see: + https://code.qt.io/cgit/qt/qtdeclarative.git/tree/dist/changes-5.14.0?h=v5.14.0 + * For the changes between 5.13.1 and 5.13.2 please see: + https://code.qt.io/cgit/qt/qtdeclarative.git/tree/dist/changes-5.13.2?h=v5.14.0 + ------------------------------------------------------------------- Wed Dec 4 14:37:36 UTC 2019 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index 40499d1..a34f945 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -21,17 +21,17 @@ %define libname libQtQuick5 Name: libqt5-qtdeclarative -Version: 5.14.0~rc +Version: 5.14.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.14.0-rc +%define real_version 5.14.0 %define so_version 5.14.0 -%define tar_version qtdeclarative-everywhere-src-5.14.0-rc -Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz +%define tar_version qtdeclarative-everywhere-src-5.14.0 +Source: https://download.qt.io/official_releases/qt/5.14/%{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 diff --git a/qtdeclarative-everywhere-src-5.14.0-rc.tar.xz b/qtdeclarative-everywhere-src-5.14.0-rc.tar.xz deleted file mode 100644 index 330243b..0000000 --- a/qtdeclarative-everywhere-src-5.14.0-rc.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2acc5c78c5a38e2a708af0c08c2ca66daca5dad40b75b7e644371b47a6e402aa -size 21253028 diff --git a/qtdeclarative-everywhere-src-5.14.0.tar.xz b/qtdeclarative-everywhere-src-5.14.0.tar.xz new file mode 100644 index 0000000..e4abbef --- /dev/null +++ b/qtdeclarative-everywhere-src-5.14.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbf11ee33d6f0d6bd6c4dc641d4f2aafbc7c6cd3b421a658955302d441dc9d8e +size 21250100 From 59bdd28c861072a647f25df90b909a7e8ec1baab64127402bc58c56f15a2b3e9 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 16 Dec 2019 09:53:22 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtdeclarative?expand=0&rev=7 --- libqt5-qtdeclarative.changes | 5 +++ libqt5-qtdeclarative.spec | 69 ++++++++++++++++++------------------ 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 263e90f..bf29a06 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 16 09:53:10 UTC 2019 - Christophe Giboudeaux + +- Update the license tags. + ------------------------------------------------------------------- Thu Dec 12 12:41:44 UTC 2019 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index a34f945..73a0b7c 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtdeclarative # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,23 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define qt5_snapshot 0 - %define libname libQtQuick5 - -Name: libqt5-qtdeclarative -Version: 5.14.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.14.0 %define so_version 5.14.0 %define tar_version qtdeclarative-everywhere-src-5.14.0 +Name: libqt5-qtdeclarative +Version: 5.14.0 +Release: 0 +Summary: Qt 5 Declarative Library +License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) +Group: Development/Libraries/X11 +URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case @@ -42,24 +40,26 @@ BuildRequires: libQt5Core-private-headers-devel >= %{version} BuildRequires: libQt5Gui-private-headers-devel >= %{version} BuildRequires: libQt5Test-private-headers-devel >= %{version} BuildRequires: libQt5Widgets-private-headers-devel >= %{version} +BuildRequires: pkgconfig BuildRequires: python3-base +BuildRequires: xz BuildRequires: pkgconfig(Qt5Core) >= %{version} BuildRequires: pkgconfig(Qt5Gui) >= %{version} BuildRequires: pkgconfig(Qt5Network) >= %{version} BuildRequires: pkgconfig(Qt5Sql) >= %{version} BuildRequires: pkgconfig(Qt5Widgets) >= %{version} -%if %qt5_snapshot +%if %{qt5_snapshot} #to create the forwarding headers BuildRequires: perl %endif -BuildRequires: xz + # NOTE recheck this once/if this package gets further splitted -%requires_ge libQt5Core5 -%requires_ge libQt5Gui5 -%requires_ge libQt5Network5 -%requires_ge libQt5Sql5 -%requires_ge libQt5Test5 -%requires_ge libQt5Widgets5 +%requires_ge libQt5Core5 +%requires_ge libQt5Gui5 +%requires_ge libQt5Network5 +%requires_ge libQt5Sql5 +%requires_ge libQt5Test5 +%requires_ge libQt5Widgets5 %description Qt is a set of libraries for developing applications. @@ -71,13 +71,13 @@ handling. %setup -q -n %{tar_version} %autopatch -p1 -%package -n %libname +%package -n %{libname} Summary: Qt 5 Declarative Library Group: Development/Libraries/X11 # Used by QtQuick.LocalStorage Requires: libQt5Sql5-sqlite -%description -n %libname +%description -n %{libname} Qt is a set of libraries for developing applications. This package contains base tools, like string, xml, and network @@ -86,7 +86,7 @@ handling. %package devel Summary: Qt Development Kit Group: Development/Libraries/X11 -Requires: %libname = %{version} +Requires: %{libname} = %{version} Requires: %{name}-tools = %{version} Provides: libQt5Quick-devel = %{version} Obsoletes: libQt5Quick-devel < %{version} @@ -97,6 +97,7 @@ You need this package, if you want to compile programs with qtdeclarative. %package tools Summary: Qt 5 Declarative Tools Group: Development/Tools/Debuggers +License: GPL-3.0-only %description tools Qt is a set of libraries for developing applications. @@ -106,7 +107,6 @@ This package contains aditional tools for inspecting, testing, viewing, etc, QML %package private-headers-devel Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ -BuildArch: noarch Requires: %{name}-devel = %{version} Requires: libQt5Core-private-headers-devel >= %{version} Requires: libQt5Gui-private-headers-devel >= %{version} @@ -114,6 +114,7 @@ Requires: libQt5Test-private-headers-devel >= %{version} Requires: libQt5Widgets-private-headers-devel >= %{version} Provides: libQt5Quick-private-headers-devel = %{version} Obsoletes: libQt5Quick-private-headers-devel < %{version} +BuildArch: noarch %description private-headers-devel This package provides private headers of libqt5-qtdeclarative that are normally @@ -124,18 +125,18 @@ the exact Qt version. %package examples Summary: Qt5 quick/qml examples Group: Development/Libraries/X11 +License: BSD-3-Clause Recommends: %{name}-devel Recommends: %{name}-tools %description examples Examples for libqt5-qtdeclarative (quick/qml) modules. -%post -n %libname -p /sbin/ldconfig - -%postun -n %libname -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig %build -%if %qt5_snapshot +%if %{qt5_snapshot} #force the configure script to generate the forwarding headers (it checks whether .git directory exists) mkdir .git %endif @@ -145,16 +146,16 @@ pushd %{_target_platform} qmake-qt5 .. -- -qml-jit popd -%{__make} %{?_smp_mflags} VERBOSE=1 -C %{_target_platform} +make %{?_smp_mflags} VERBOSE=1 -C %{_target_platform} -%ifarch %ix86 +%ifarch %{ix86} %if 0%{?sle_version:%sle_version} < 150000 # build libQt5Qml with no_sse2 mkdir -p %{_target_platform}-no_sse2 pushd %{_target_platform}-no_sse2 %qmake5 -config no_sse2 .. -- -no-qml-jit -make sub-src-clean -%{__make} %{?_smp_mflags} VERBOSE=1 -C src/qml +make %{?_smp_mflags} sub-src-clean +make %{?_smp_mflags} VERBOSE=1 -C src/qml popd %endif %endif @@ -164,7 +165,7 @@ pushd %{_target_platform} %qmake5_install popd -%ifarch %ix86 +%ifarch %{ix86} %if 0%{?sle_version:%sle_version} < 150000 mkdir -p %{buildroot}%{_libqt5_libdir}//sse2 mv %{buildroot}%{_libqt5_libdir}/libQt5Qml.so.5* %{buildroot}%{_libqt5_libdir}/sse2/ @@ -199,10 +200,10 @@ popd %fdupes -s %{buildroot}%{_libqt5_includedir} %fdupes -s %{buildroot}%{_libqt5_examplesdir} -%files -n %libname +%files -n %{libname} %license LICENSE.* %{_libqt5_libdir}/libQt5Q*.so.* -%ifarch %ix86 +%ifarch %{ix86} %if 0%{?sle_version:%sle_version} < 150000 %{_libqt5_libdir}/sse2/libQt5Q*.so.* %endif