From a47e9044a3c68700960aefdaa155a958a7e4ce4026f1d7126e5354d1adc9a87a Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 28 Jun 2022 08:21:47 +0000 Subject: [PATCH] Qt 5.15.5 with patch collection + qtscript 5.15.10 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qttools?expand=0&rev=15 --- 0001-Revert-Bump-version.patch | 23 -------------------- _service | 4 ++-- libqt5-qttools.changes | 24 +++++++++++++++++++++ libqt5-qttools.spec | 8 +++---- qttools-everywhere-src-5.15.2+kde17.obscpio | 3 --- qttools-everywhere-src-5.15.5+kde1.obscpio | 3 +++ qttools-everywhere-src.obsinfo | 7 +++--- 7 files changed, 35 insertions(+), 37 deletions(-) delete mode 100644 0001-Revert-Bump-version.patch delete mode 100644 qttools-everywhere-src-5.15.2+kde17.obscpio create mode 100644 qttools-everywhere-src-5.15.5+kde1.obscpio diff --git a/0001-Revert-Bump-version.patch b/0001-Revert-Bump-version.patch deleted file mode 100644 index af14353..0000000 --- a/0001-Revert-Bump-version.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8a2e60a7486d7f31c487efb7a0108743ed54c6fb Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Tue, 22 Jun 2021 21:35:06 +0200 -Subject: [PATCH] Revert "Bump version" - -This reverts commit dbe0567470db2b369a9fdb28d9fbac38be3e2d60. ---- - .qmake.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/.qmake.conf b/.qmake.conf -index 05561703..6ec606e7 100644 ---- a/.qmake.conf -+++ b/.qmake.conf -@@ -2,4 +2,4 @@ load(qt_build_config) - - DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST - --MODULE_VERSION = 5.15.3 -+MODULE_VERSION = 5.15.2 --- -2.20.1 - diff --git a/_service b/_service index de38049..902e4d9 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ enable - 5.15.2+kde@TAG_OFFSET@ + 5.15.5+kde@TAG_OFFSET@ https://invent.kde.org/qt/qt/qttools.git git qttools-everywhere-src kde/5.15 - v5.15.2 + v5.15.5-lts-lgpl enable diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index fc2184b..fbadee1 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Jun 27 13:10:31 UTC 2022 - Fabian Vogt + +- Update to version 5.15.5+kde1, rebased upstream: + * Ensure FileAttributeSetTable is filled ordered so we get the same qch file each time + * Fix regression in lconvert handling empty translations + * Qt Designer: Fix alignment when adding new QTableWidget columns + * Qt Designer: Fix alignment of horizontal QTableWidget headers + * Qt Designer: Fix saving of item view header visibility on page based containers + * Qt Designer: Slow down wheel scrolling of the widget box + * Revert "Update commercial license headers" + * QDoc: Fix possible crash in WebXMLGenerator + * Fix check for malformed input when decoding translations + * Fix redeclared variable name + * qdoc: Allow any type of page as qhp indexTitle + * qdoc: Don't clear the warning count in single-exec mode + * Bump copyright year to 2021 + * qdoc: Fix generation of TOC for basic QML/JS types + * Update commercial license headers + * qdoc: Fix addendums for QML signals that contain '.' in the name + * qdoc: Ignore empty example meta tags + * qdoc: Fix breadcrumb generation for normal page nodes +- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now + ------------------------------------------------------------------- Tue Jun 22 19:35:06 UTC 2021 - Fabian Vogt diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index 9b113c2..95200c8 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -18,8 +18,8 @@ %define qt5_snapshot 1 %define base_name libqt5 -%define real_version 5.15.2 -%define so_version 5.15.2 +%define real_version 5.15.5 +%define so_version 5.15.5 %define tar_version qttools-everywhere-src-%{version} %if 0%{?suse_version} >= 1330 %bcond_without qdoc @@ -28,7 +28,7 @@ %bcond_with qdoc %endif Name: libqt5-qttools -Version: 5.15.2+kde17 +Version: 5.15.5+kde1 Release: 0 Summary: Qt 5 QtTools Module # Legal: @@ -47,8 +47,6 @@ Source12: linguist5.desktop Source13: assistant5.desktop Source14: qdbusviewer5.desktop Source99: libqt5-qttools-rpmlintrc -# PATCH-FIX-OPENSUSE -Patch1: 0001-Revert-Bump-version.patch %if %{with qdoc} BuildRequires: clang-devel >= 3.9.0 %endif diff --git a/qttools-everywhere-src-5.15.2+kde17.obscpio b/qttools-everywhere-src-5.15.2+kde17.obscpio deleted file mode 100644 index 34071b8..0000000 --- a/qttools-everywhere-src-5.15.2+kde17.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8598c8aedcd7d7a0e405c238703cc092e13cfddd8cccdc4dce761940ef0676ad -size 51978767 diff --git a/qttools-everywhere-src-5.15.5+kde1.obscpio b/qttools-everywhere-src-5.15.5+kde1.obscpio new file mode 100644 index 0000000..6b451b4 --- /dev/null +++ b/qttools-everywhere-src-5.15.5+kde1.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14d4896c8f0408947a0a656898aff1e39f0dd9d2ec8169f8a04f010400f8a65b +size 51988494 diff --git a/qttools-everywhere-src.obsinfo b/qttools-everywhere-src.obsinfo index acd58f2..fa5e117 100644 --- a/qttools-everywhere-src.obsinfo +++ b/qttools-everywhere-src.obsinfo @@ -1,5 +1,4 @@ name: qttools-everywhere-src -version: 5.15.2+kde17 -mtime: 1606896391 -commit: 33693a928986006d79c1ee743733cde5966ac402 - +version: 5.15.5+kde1 +mtime: 1655652678 +commit: 672ba9d902be3634a9fef80be65227aece9e0aed