diff --git a/0001-Revert-Bump-version.patch b/0001-Revert-Bump-version.patch deleted file mode 100644 index 07e96dc..0000000 --- a/0001-Revert-Bump-version.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 81ce716dd6e3834781b54214eeb1634add0aa38d Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Tue, 22 Jun 2021 11:51:48 +0200 -Subject: [PATCH] Revert "Bump version" - -This reverts commit 2e32d0975eb058c2076597c03b07c67b7ce9027f. ---- - .qmake.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/.qmake.conf b/.qmake.conf -index 25b262d67..4d40e4272 100644 ---- a/.qmake.conf -+++ b/.qmake.conf -@@ -5,4 +5,4 @@ DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST - - QQC2_SOURCE_TREE = $$PWD - --MODULE_VERSION = 5.15.3 -+MODULE_VERSION = 5.15.2 --- -2.20.1 - diff --git a/_service b/_service index 7d78bb4..00fd269 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/qtquickcontrols2.git git qtquickcontrols2-everywhere-src kde/5.15 - v5.15.2 + v5.15.5-lts-lgpl enable diff --git a/libqt5-qtquickcontrols2.changes b/libqt5-qtquickcontrols2.changes index 7140d03..d7cb6db 100644 --- a/libqt5-qtquickcontrols2.changes +++ b/libqt5-qtquickcontrols2.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Mon Jun 27 13:10:04 UTC 2022 - Fabian Vogt + +- Update to version 5.15.5+kde5, rebased upstream: + * Revert "Allow creation of custom QQuickPopupItem-derived types" + * QQuickAbstractButton: fix crash on destruction + * TextArea: Detach the flickable when it is deleted + * Don't call QQml_setParent_noEvent with a nullptr item + * Hide old scroll bars + * Allow creation of custom QQuickPopupItem-derived types + * Imagine: fix GroupBox's bottom edge being clipped + * QQuickDial: Keep value integer if everything is integer + * ScrollView: fix crash when scrolling with zero-sized item + * Change the name of the material style plugin to avoid a path limit + * QmlDesigner: Fix RangeSliderSpecifics snap mode + * Ensure the ninepatch image is detached + * Ninepatch: keep resetNode status to not lose track of ImageNode->NinePatchNode changes + * Revert "Update commercial license headers" + * Fix static build + * ComboBox: don't focus TextField when clicking on indicator + * Combobox: Fix initial set of inputMethodHints + * Fix popups with exit transitions blocking mouse events when destroyed + * a11y: Fix ordering on header, content item and footer in Page + * Update commercial license headers + * Fix initial currentIndex in Tumbler when wrap is set to false + * SwipeDelegate: ensure background and contentItem are resized + * Reset the opacity and scale properties after the exit transition +- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now + ------------------------------------------------------------------- Fri Jan 21 08:13:58 UTC 2022 - Fabian Vogt diff --git a/libqt5-qtquickcontrols2.spec b/libqt5-qtquickcontrols2.spec index 6b934d7..966bf12 100644 --- a/libqt5-qtquickcontrols2.spec +++ b/libqt5-qtquickcontrols2.spec @@ -21,19 +21,17 @@ %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 qtquickcontrols2-everywhere-src-%{version} Name: libqt5-qtquickcontrols2 -Version: 5.15.2+kde10 +Version: 5.15.5+kde5 Release: 0 Summary: Qt 5 Quick Controls Addon 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: %{tar_version}.tar.xz -# PATCH-FIX-OPENSUSE -Patch1: 0001-Revert-Bump-version.patch BuildRequires: fdupes BuildRequires: libQt5Core-private-headers-devel >= %{real_version} BuildRequires: libQt5Gui-private-headers-devel >= %{real_version} diff --git a/qtquickcontrols2-everywhere-src-5.15.2+kde10.obscpio b/qtquickcontrols2-everywhere-src-5.15.2+kde10.obscpio deleted file mode 100644 index c2bb55d..0000000 --- a/qtquickcontrols2-everywhere-src-5.15.2+kde10.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e23d611653c952ce50e790b8b5c1ae42485c02836d1bd673efe7776b28d40742 -size 21470221 diff --git a/qtquickcontrols2-everywhere-src-5.15.5+kde5.obscpio b/qtquickcontrols2-everywhere-src-5.15.5+kde5.obscpio new file mode 100644 index 0000000..1aefbed --- /dev/null +++ b/qtquickcontrols2-everywhere-src-5.15.5+kde5.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f81489f6a084d56878b2485ebaa6a9b156d200cfc43a1a3a91c5923d0c11dfb5 +size 21499405 diff --git a/qtquickcontrols2-everywhere-src.obsinfo b/qtquickcontrols2-everywhere-src.obsinfo index b31e5ba..70df971 100644 --- a/qtquickcontrols2-everywhere-src.obsinfo +++ b/qtquickcontrols2-everywhere-src.obsinfo @@ -1,4 +1,4 @@ name: qtquickcontrols2-everywhere-src -version: 5.15.2+kde10 -mtime: 1642717327 -commit: b092b19a18d14e70beae6afebc6bde5d83e9eed7 +version: 5.15.5+kde5 +mtime: 1655472253 +commit: 59cc1cc5b3719713598a1f426d82a9d895b5dccb