From 2e24b27243c58600f8c48d9ce45f58a46831cea70bf3229d9089c2ae6d09c04c Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 24 Jun 2021 12:00:32 +0000 Subject: [PATCH] Qt from KDE git OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtquickcontrols2?expand=0&rev=13 --- 0001-Revert-Bump-version.patch | 23 +++++++++++++++++++ _service | 18 +++++++++++++++ _servicedata | 4 ++++ libqt5-qtquickcontrols2.changes | 15 ++++++++++++ libqt5-qtquickcontrols2.spec | 22 ++++++++++-------- ...ntrols2-everywhere-src-5.15.2+kde7.obscpio | 3 +++ qtquickcontrols2-everywhere-src-5.15.2.tar.xz | 3 --- qtquickcontrols2-everywhere-src.obsinfo | 5 ++++ 8 files changed, 80 insertions(+), 13 deletions(-) create mode 100644 0001-Revert-Bump-version.patch create mode 100644 _service create mode 100644 _servicedata create mode 100644 qtquickcontrols2-everywhere-src-5.15.2+kde7.obscpio delete mode 100644 qtquickcontrols2-everywhere-src-5.15.2.tar.xz create mode 100644 qtquickcontrols2-everywhere-src.obsinfo diff --git a/0001-Revert-Bump-version.patch b/0001-Revert-Bump-version.patch new file mode 100644 index 0000000..07e96dc --- /dev/null +++ b/0001-Revert-Bump-version.patch @@ -0,0 +1,23 @@ +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 new file mode 100644 index 0000000..7d78bb4 --- /dev/null +++ b/_service @@ -0,0 +1,18 @@ + + + enable + 5.15.2+kde@TAG_OFFSET@ + https://invent.kde.org/qt/qt/qtquickcontrols2.git + git + qtquickcontrols2-everywhere-src + kde/5.15 + v5.15.2 + enable + + + + + *.tar + xz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..69bb2b5 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://invent.kde.org/qt/qt/qtquickcontrols2.git + a2593ff9cf5d0af885c20c2e9f9faa6ca4f1c1a3 \ No newline at end of file diff --git a/libqt5-qtquickcontrols2.changes b/libqt5-qtquickcontrols2.changes index 50a4851..32ebbec 100644 --- a/libqt5-qtquickcontrols2.changes +++ b/libqt5-qtquickcontrols2.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Jun 22 09:51:48 UTC 2021 - Fabian Vogt + +- Switch to KDE's maintenance branch +- Update to version 5.15.2+kde7: + * QmlDesigner: Remove duplicate of repeat + * Doc: remove all instances of \qmlpropertygroup + * Doc: fix Qt Labs Platform Menu icon documentation + * Fix QQuickHeaderView models to pass model tester + * Doc: fix SplitView's inheritance + * Add changes file for Qt 5.15.2 + * Bump version +- Add patch to reset version to 5.15.2: + * 0001-Revert-Bump-version.patch + ------------------------------------------------------------------- Sat Jan 16 16:25:20 UTC 2021 - Fabian Vogt diff --git a/libqt5-qtquickcontrols2.spec b/libqt5-qtquickcontrols2.spec index 1e3b2c1..f1fa578 100644 --- a/libqt5-qtquickcontrols2.spec +++ b/libqt5-qtquickcontrols2.spec @@ -19,32 +19,34 @@ # Internal QML imports of examples %global __requires_exclude qmlimport\\((Backend|Theme|.*example).* -%define qt5_snapshot 0 +%define qt5_snapshot 1 %define base_name libqt5 %define real_version 5.15.2 %define so_version 5.15.2 -%define tar_version qtquickcontrols2-everywhere-src-5.15.2 +%define tar_version qtquickcontrols2-everywhere-src-%{version} Name: libqt5-qtquickcontrols2 -Version: 5.15.2 +Version: 5.15.2+kde7 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: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz +Source: %{tar_version}.tar.xz +# PATCH-FIX-OPENSUSE +Patch1: 0001-Revert-Bump-version.patch BuildRequires: fdupes -BuildRequires: libQt5Core-private-headers-devel >= %{version} -BuildRequires: libQt5Gui-private-headers-devel >= %{version} -BuildRequires: libqt5-qtbase-devel >= %{version} -BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} +BuildRequires: libQt5Core-private-headers-devel >= %{real_version} +BuildRequires: libQt5Gui-private-headers-devel >= %{real_version} +BuildRequires: libqt5-qtbase-devel >= %{real_version} +BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{real_version} %if %{qt5_snapshot} #to create the forwarding headers BuildRequires: perl %endif BuildRequires: pkgconfig BuildRequires: xz -BuildRequires: pkgconfig(Qt5Qml) >= %{version} -BuildRequires: pkgconfig(Qt5Quick) >= %{version} +BuildRequires: pkgconfig(Qt5Qml) >= %{real_version} +BuildRequires: pkgconfig(Qt5Quick) >= %{real_version} %requires_ge libQt5Widgets5 %requires_ge libQtQuick5 diff --git a/qtquickcontrols2-everywhere-src-5.15.2+kde7.obscpio b/qtquickcontrols2-everywhere-src-5.15.2+kde7.obscpio new file mode 100644 index 0000000..b639520 --- /dev/null +++ b/qtquickcontrols2-everywhere-src-5.15.2+kde7.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d70e816f668c0c3f9c567691ac77e7430f8cc35ace3fa3b0cec7df855af9c079 +size 21456398 diff --git a/qtquickcontrols2-everywhere-src-5.15.2.tar.xz b/qtquickcontrols2-everywhere-src-5.15.2.tar.xz deleted file mode 100644 index 240a1bc..0000000 --- a/qtquickcontrols2-everywhere-src-5.15.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 -size 8284692 diff --git a/qtquickcontrols2-everywhere-src.obsinfo b/qtquickcontrols2-everywhere-src.obsinfo new file mode 100644 index 0000000..fe2b694 --- /dev/null +++ b/qtquickcontrols2-everywhere-src.obsinfo @@ -0,0 +1,5 @@ +name: qtquickcontrols2-everywhere-src +version: 5.15.2+kde7 +mtime: 1605025660 +commit: a2593ff9cf5d0af885c20c2e9f9faa6ca4f1c1a3 +