From 45d0a767126654040b1855df8ecc729ef2ad55660a24e01a6ec1fe052b6375d2 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 7 Sep 2019 17:41:39 +0000 Subject: [PATCH] Accepting request 729107 from home:Vogtinator:qt5.13 Qt 5.13.1, disable KU* and KF* publishing before accepting OBS-URL: https://build.opensuse.org/request/show/729107 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qtdeclarative?expand=0&rev=8 --- libqt5-qtdeclarative.changes | 15 +++++++++++++++ libqt5-qtdeclarative.spec | 19 +++++++++---------- qtdeclarative-everywhere-src-5.13.0.tar.xz | 3 --- qtdeclarative-everywhere-src-5.13.1.tar.xz | 3 +++ 4 files changed, 27 insertions(+), 13 deletions(-) delete mode 100644 qtdeclarative-everywhere-src-5.13.0.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.13.1.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 5ed0e8a..28234b9 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,8 +1,23 @@ +------------------------------------------------------------------- +Fri Sep 6 08:03:38 UTC 2019 - Fabian Vogt + +- Update to 5.13.1: + * New bugfix release + * For more details please see: + * http://code.qt.io/cgit/qt/qtdeclarative.git/plain/dist/changes-5.13.1/?h=v5.13.1 + ------------------------------------------------------------------- Fri Aug 16 07:25:24 UTC 2019 - Fabian Vogt - QtQuick.LocalStorage needs libQt5Sql5-sqlite +------------------------------------------------------------------- +Wed Jul 3 10:02:23 UTC 2019 - Fabian Vogt + +- Link from Qt bindir into %_bindir, not the other way around to fix + applicationDirPath called from Qt binaries +- Add -qt5 suffix to all binaries in %_bindir + ------------------------------------------------------------------- Wed Jun 19 11:19:49 UTC 2019 - fabian@ritter-vogt.de diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index fea0321..3c10b7f 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -21,16 +21,16 @@ %define libname libQtQuick5 Name: libqt5-qtdeclarative -Version: 5.13.0 +Version: 5.13.1 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.0 -%define so_version 5.13.0 -%define tar_version qtdeclarative-everywhere-src-5.13.0 +%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 Source1: baselibs.conf # PATCH-FIX-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case @@ -179,19 +179,18 @@ find %{buildroot}/%{_libdir}/pkgconfig -type f -name '*pc' -print -exec perl -pi # kill .la files rm -f %{buildroot}%{_libqt5_libdir}/lib*.la -# put all the binaries to %%_bindir, add -qt5 suffix, and symlink them back to %%_qt5_bindir +# Link all the binaries with -qt5 suffix to %{_bindir} mkdir -p %{buildroot}%{_bindir} pushd %{buildroot}%{_libqt5_bindir} for i in * ; do case "${i}" in qmlplugindump|qmlprofiler) - mv $i ../../../bin/${i}-qt5 - ln -s ../../../bin/${i}-qt5 . - ln -s ../../../bin/${i}-qt5 $i + ln -s %{_libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}-qt5 ;; *) - mv $i ../../../bin/ - ln -s ../../../bin/$i . + # No conflict with Qt4, so keep the original name for compatibility + ln -s %{_libqt5_bindir}/$i %{buildroot}%{_bindir}/${i} + ln -s %{_libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}-qt5 ;; esac done diff --git a/qtdeclarative-everywhere-src-5.13.0.tar.xz b/qtdeclarative-everywhere-src-5.13.0.tar.xz deleted file mode 100644 index 53aad46..0000000 --- a/qtdeclarative-everywhere-src-5.13.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9e8780aef0af4a60e64dcc405bdf5c03a04b28e3b94d5c2e69d0006db566ba9 -size 20514784 diff --git a/qtdeclarative-everywhere-src-5.13.1.tar.xz b/qtdeclarative-everywhere-src-5.13.1.tar.xz new file mode 100644 index 0000000..4ae98fe --- /dev/null +++ b/qtdeclarative-everywhere-src-5.13.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae3477401b13d6b31e8569629d3f73b3e81e27cec27595988ffd320eaec7f0e2 +size 20918916