From ec7b31adc1b5b122a8d1a50542f3fb2db7e317bb5e5f7330eb66e261140f2ae3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 21 Mar 2019 08:40:10 +0000 Subject: [PATCH] Accepting request 685629 from KDE:Qt5 Qt 5.12.2 OBS-URL: https://build.opensuse.org/request/show/685629 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdeclarative?expand=0&rev=51 --- libqt5-qtdeclarative.changes | 23 ++++++++++++++++++++++ libqt5-qtdeclarative.spec | 12 +++++------ qtdeclarative-everywhere-src-5.12.0.tar.xz | 3 --- qtdeclarative-everywhere-src-5.12.2.tar.xz | 3 +++ 4 files changed, 32 insertions(+), 9 deletions(-) delete mode 100644 qtdeclarative-everywhere-src-5.12.0.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.12.2.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 1d3d82a..9bb67d8 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Mar 14 08:48:03 UTC 2019 - fabian@ritter-vogt.de + +- Update to 5.12.2: + * New bugfix release + * For more details please see: + * http://code.qt.io/cgit/qt/qtdeclarative.git/plain/dist/changes-5.12.2/?h=5.12.2 + +------------------------------------------------------------------- +Mon Feb 4 07:49:14 UTC 2019 - Fabian Vogt + +- Work around cmake issue by expanding make_jobs manually, ignoring + cmake breaks autoprovides + +------------------------------------------------------------------- +Fri Feb 1 08:39:40 UTC 2019 - fabian@ritter-vogt.de + +- Update to 5.12.1: + * New bugfix release + * For more details please see: + * http://code.qt.io/cgit/qt/qtdeclarative.git/plain/dist/changes-5.12.1/?h=v5.12.1 +- cmake breaks %make_jobs - ignore it (boo#1091864) + ------------------------------------------------------------------- Thu Dec 6 13:35:28 UTC 2018 - fabian@ritter-vogt.de diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index c5971e0..e407b47 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -21,16 +21,16 @@ %define libname libQtQuick5 Name: libqt5-qtdeclarative -Version: 5.12.0 +Version: 5.12.2 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.12.0 -%define so_version 5.12.0 -%define tar_version qtdeclarative-everywhere-src-5.12.0 +%define real_version 5.12.2 +%define so_version 5.12.2 +%define tar_version qtdeclarative-everywhere-src-5.12.2 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 @@ -143,7 +143,7 @@ pushd %{_target_platform} qmake-qt5 .. popd -%make_jobs -C %{_target_platform} +%{__make} %{?_smp_mflags} VERBOSE=1 -C %{_target_platform} %ifarch %ix86 %if 0%{?sle_version:%sle_version} < 150000 @@ -152,7 +152,7 @@ mkdir -p %{_target_platform}-no_sse2 pushd %{_target_platform}-no_sse2 %qmake5 -config no_sse2 .. make sub-src-clean -%make_jobs -C src/qml +%{__make} %{?_smp_mflags} VERBOSE=1 -C src/qml popd %endif %endif diff --git a/qtdeclarative-everywhere-src-5.12.0.tar.xz b/qtdeclarative-everywhere-src-5.12.0.tar.xz deleted file mode 100644 index d5c3f73..0000000 --- a/qtdeclarative-everywhere-src-5.12.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ffd58102b5714ae058f91cc31511f1c928978f77f01652beb9ce2352a4c227b -size 20436712 diff --git a/qtdeclarative-everywhere-src-5.12.2.tar.xz b/qtdeclarative-everywhere-src-5.12.2.tar.xz new file mode 100644 index 0000000..f78dae0 --- /dev/null +++ b/qtdeclarative-everywhere-src-5.12.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:470568745602e7fa21cdca42b1641162e4257cfeb7a2dcf8af24538c9516cc5b +size 20496648