From 232dc2814f2c9c2ca856a0990450950d8f0e5810ffde2549c2db9b35ab3d8c28 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 24 Jun 2021 12:00:19 +0000 Subject: [PATCH] Qt from KDE git OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtgraphicaleffects?expand=0&rev=12 --- 0001-Revert-Bump-version.patch | 23 +++++++++++++++++++ _service | 18 +++++++++++++++ _servicedata | 4 ++++ libqt5-qtgraphicaleffects.changes | 10 ++++++++ libqt5-qtgraphicaleffects.spec | 16 +++++++------ ...effects-everywhere-src-5.15.2+kde2.obscpio | 3 +++ ...phicaleffects-everywhere-src-5.15.2.tar.xz | 3 --- qtgraphicaleffects-everywhere-src.obsinfo | 5 ++++ 8 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 0001-Revert-Bump-version.patch create mode 100644 _service create mode 100644 _servicedata create mode 100644 qtgraphicaleffects-everywhere-src-5.15.2+kde2.obscpio delete mode 100644 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz create mode 100644 qtgraphicaleffects-everywhere-src.obsinfo diff --git a/0001-Revert-Bump-version.patch b/0001-Revert-Bump-version.patch new file mode 100644 index 0000000..8bb8c36 --- /dev/null +++ b/0001-Revert-Bump-version.patch @@ -0,0 +1,23 @@ +From bcb019d9d878e9f82b804f1005bb1f3070d3e85c Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Tue, 22 Jun 2021 21:38:53 +0200 +Subject: [PATCH] Revert "Bump version" + +This reverts commit 997858cb7b68d138c999fa1eeebe2a38a9d88547. +--- + .qmake.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.qmake.conf b/.qmake.conf +index 5fb75cf..1dc5dd1 100644 +--- a/.qmake.conf ++++ b/.qmake.conf +@@ -2,4 +2,4 @@ load(qt_build_config) + + DEFINES += QT_NO_FOREACH 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 new file mode 100644 index 0000000..ec2f17b --- /dev/null +++ b/_service @@ -0,0 +1,18 @@ + + + enable + 5.15.2+kde@TAG_OFFSET@ + https://invent.kde.org/qt/qt/qtgraphicaleffects.git + git + qtgraphicaleffects-everywhere-src + kde/5.15 + v5.15.2 + enable + + + + + *.tar + xz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..2ace433 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://invent.kde.org/qt/qt/qtgraphicaleffects.git + c36998dc1581167b12cc3de8e4ac68c2a5d9f76e \ No newline at end of file diff --git a/libqt5-qtgraphicaleffects.changes b/libqt5-qtgraphicaleffects.changes index 9e2e939..cfd16b3 100644 --- a/libqt5-qtgraphicaleffects.changes +++ b/libqt5-qtgraphicaleffects.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jun 22 19:38:54 UTC 2021 - Fabian Vogt + +- Switch to KDE's maintenance branch +- Update to version 5.15.2+kde2: + * Add changes file for Qt 5.15.2 + * Bump version +- Add patch to reset version to 5.15.2: + * 0001-Revert-Bump-version.patch + ------------------------------------------------------------------- Fri Nov 20 12:09:19 UTC 2020 - Fabian Vogt diff --git a/libqt5-qtgraphicaleffects.spec b/libqt5-qtgraphicaleffects.spec index 1d13873..63400b2 100644 --- a/libqt5-qtgraphicaleffects.spec +++ b/libqt5-qtgraphicaleffects.spec @@ -16,22 +16,24 @@ # -%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 qtgraphicaleffects-everywhere-src-5.15.2 +%define tar_version qtgraphicaleffects-everywhere-src-%{version} Name: libqt5-qtgraphicaleffects -Version: 5.15.2 +Version: 5.15.2+kde2 Release: 0 Summary: Qt 5 Graphical Effects # Legal: the 'tools' folder is not built. 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 -BuildRequires: libqt5-qtdeclarative-devel >= %{version} -BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} +Source: %{tar_version}.tar.xz +# PATCH-FIX-OPENSUSE +Patch1: 0001-Revert-Bump-version.patch +BuildRequires: libqt5-qtdeclarative-devel >= %{real_version} +BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{real_version} BuildRequires: xz %requires_ge libQtQuick5 %if %{qt5_snapshot} @@ -46,7 +48,7 @@ This package contains base tools, like string, xml, and network handling. %prep -%setup -q -n %{tar_version} +%autosetup -p1 -n %{tar_version} %build %if %{qt5_snapshot} diff --git a/qtgraphicaleffects-everywhere-src-5.15.2+kde2.obscpio b/qtgraphicaleffects-everywhere-src-5.15.2+kde2.obscpio new file mode 100644 index 0000000..9970a77 --- /dev/null +++ b/qtgraphicaleffects-everywhere-src-5.15.2+kde2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93210f78ca154c7151b659ab7813edd86a1cefdd524aa6c074d8a7af36b2766a +size 18248718 diff --git a/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz b/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz deleted file mode 100644 index d182e9f..0000000 --- a/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 -size 14040900 diff --git a/qtgraphicaleffects-everywhere-src.obsinfo b/qtgraphicaleffects-everywhere-src.obsinfo new file mode 100644 index 0000000..92a545f --- /dev/null +++ b/qtgraphicaleffects-everywhere-src.obsinfo @@ -0,0 +1,5 @@ +name: qtgraphicaleffects-everywhere-src +version: 5.15.2+kde2 +mtime: 1604573028 +commit: c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +