diff --git a/fix-for-opensuse-qmake-qt5.patch b/fix-for-opensuse-qmake-qt5.patch index 3c7da56..dec7910 100644 --- a/fix-for-opensuse-qmake-qt5.patch +++ b/fix-for-opensuse-qmake-qt5.patch @@ -1,27 +1,13 @@ -diff -ru a/src/linguist/lrelease/main.cpp b/src/linguist/lrelease/main.cpp ---- a/src/linguist/lrelease/main.cpp 2014-12-06 00:24:59.000000000 +0800 -+++ b/src/linguist/lrelease/main.cpp 2015-01-12 10:50:16.717756760 +0800 -@@ -310,9 +310,9 @@ - option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); - if (option.qmake_abslocation.isEmpty()) - #ifdef QT_BOOTSTRAPPED -- option.qmake_abslocation = binDir + QLatin1String("/qmake"); -+ option.qmake_abslocation = binDir + QLatin1String("/qmake-qt5"); - #else -- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake"); -+ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5"); - #endif - option.initProperties(); - QMakeVfs vfs; -diff -ru a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp ---- a/src/linguist/lupdate/main.cpp 2014-12-06 00:24:59.000000000 +0800 -+++ b/src/linguist/lupdate/main.cpp 2015-01-12 10:50:16.718756760 +0800 -@@ -1048,7 +1048,7 @@ - ProFileGlobals option; - option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); - if (option.qmake_abslocation.isEmpty()) -- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake"); -+ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5"); - option.debugLevel = proDebug; - option.initProperties(); - option.setCommandLineArguments(QDir::currentPath(), +Index: qttools-everywhere-src-5.13.0-beta1/src/linguist/lprodump/main.cpp +=================================================================== +--- qttools-everywhere-src-5.13.0-beta1.orig/src/linguist/lprodump/main.cpp ++++ qttools-everywhere-src-5.13.0-beta1/src/linguist/lprodump/main.cpp +@@ -438,7 +438,7 @@ int main(int argc, char **argv) + ProFileGlobals option; + option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); + if (option.qmake_abslocation.isEmpty()) +- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake"); ++ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5"); + option.debugLevel = proDebug; + option.initProperties(); + option.setCommandLineArguments(QDir::currentPath(), diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index f70fa23..75fd6a2 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,9 +1,40 @@ +------------------------------------------------------------------- +Wed Jun 19 11:24:38 UTC 2019 - fabian@ritter-vogt.de + +- Update to 5.13.0: + * New bugfix release + * No changelog available + * For more details about Qt 5.13 please see: + * http://code.qt.io/cgit/qt/qttools.git/plain/dist/changes-5.13.0/?h=5.13 +- Drop patches, now upstream: + * 0001-qdoc-Don-t-spam-garbage.patch + +------------------------------------------------------------------- +Wed Jun 5 08:14:35 UTC 2019 - Fabian Vogt + +- Add patch to fix doc builds getting terminated: + * 0001-qdoc-Don-t-spam-garbage.patch + +------------------------------------------------------------------- +Tue Jun 4 07:25:11 UTC 2019 - fabian@ritter-vogt.de + +- Update to 5.13.0-rc: + * New bugfix release + * No changelog available + ------------------------------------------------------------------- Tue May 28 08:21:06 UTC 2019 - Martin Liška - Use -ffat-lto-objects in order to provide proper static library: libQt5UiTools.a. +------------------------------------------------------------------- +Mon Apr 29 09:17:00 UTC 2019 - fabian@ritter-vogt.de + +- Update to 5.13.0-beta2: + * New bugfix release + * No changelog available + ------------------------------------------------------------------- Thu Apr 18 07:27:36 UTC 2019 - fabian@ritter-vogt.de @@ -12,6 +43,15 @@ Thu Apr 18 07:27:36 UTC 2019 - fabian@ritter-vogt.de * For more details please see: * http://code.qt.io/cgit/qt/qttools.git/plain/dist/changes-5.12.3/?h=v5.12.3 +------------------------------------------------------------------- +Thu Mar 21 10:26:22 UTC 2019 - fabian@ritter-vogt.de + +- Update to 5.13.0-beta1: + * New feature release + * For more details about Qt 5.13 please see: + * http://code.qt.io/cgit/qt/qttools.git/plain/dist/changes-5.13.0/?h=5.13 +- Refresh fix-for-opensuse-qmake-qt5.patch + ------------------------------------------------------------------- Thu Mar 14 08:51:54 UTC 2019 - fabian@ritter-vogt.de @@ -585,3 +625,4 @@ Fri Apr 13 13:22:38 UTC 2012 - stephan.binner@basyskom.com Thu Apr 5 09:56:15 UTC 2012 - dmueller@suse.com - Initial packaging (Qt 5.0 Alpha) + diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index eb876fa..f8bab11 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -25,17 +25,17 @@ %define qt5_snapshot 0 Name: libqt5-qttools -Version: 5.12.3 +Version: 5.13.0 Release: 0 Summary: Qt 5 QtTools Module 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.3 -%define so_version 5.12.3 -%define tar_version qttools-everywhere-src-5.12.3 -Source: https://download.qt.io/official_releases/qt/5.12/%{real_version}/submodules/%{tar_version}.tar.xz +%define real_version 5.13.0 +%define so_version 5.13.0 +%define tar_version qttools-everywhere-src-5.13.0 +Source: https://download.qt.io/official_releases/qt/5.13/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf Source11: designer5.desktop Source12: linguist5.desktop @@ -74,8 +74,7 @@ Qt is a set of libraries for developing applications. This package contains base tools, like string, xml, and network handling. %prep -%setup -q -n %{tar_version} -%autopatch -p1 +%autosetup -p1 -n %{tar_version} %package devel Summary: Development files for the Qt5 Tools library @@ -289,10 +288,12 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{ %license LICENSE.* %{_bindir}/lconvert* %{_bindir}/linguist* +%{_bindir}/lprodump* %{_bindir}/lrelease* %{_bindir}/lupdate* %{_libqt5_bindir}/lconvert* %{_libqt5_bindir}/linguist* +%{_libqt5_bindir}/lprodump* %{_libqt5_bindir}/lrelease* %{_libqt5_bindir}/lupdate* %{_datadir}/applications/linguist5.desktop diff --git a/qttools-everywhere-src-5.12.3.tar.xz b/qttools-everywhere-src-5.12.3.tar.xz deleted file mode 100644 index 2deaa36..0000000 --- a/qttools-everywhere-src-5.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c9e92d2f0d369e44bb1a60e9fa6d970f8d9893d653212305e04be5e6daec2cd8 -size 9809196 diff --git a/qttools-everywhere-src-5.13.0.tar.xz b/qttools-everywhere-src-5.13.0.tar.xz new file mode 100644 index 0000000..275d36c --- /dev/null +++ b/qttools-everywhere-src-5.13.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7887a618dc6434c2567521990c2a7ca72ca6a8379c1d93c5aa6c1798d7a0819 +size 9083492