diff --git a/0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch b/0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch new file mode 100644 index 0000000..db79472 --- /dev/null +++ b/0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch @@ -0,0 +1,23 @@ +From 356ec23ba0d96855d9a33bc1abd51977b336e962 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Tue, 22 Jun 2021 21:40:05 +0200 +Subject: [PATCH 1/2] Revert "Bump version from 5.15.3 to 5.15.4" + +This reverts commit 5cec94b2c1503f106f4ef4778d016410ebb86211. +--- + .qmake.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.qmake.conf b/.qmake.conf +index 0a9b5a9..0057b81 100644 +--- a/.qmake.conf ++++ b/.qmake.conf +@@ -3,4 +3,4 @@ android|boot2qt: CONFIG -= headersclean + + DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST + +-MODULE_VERSION = 5.15.4 ++MODULE_VERSION = 5.15.3 +-- +2.20.1 + diff --git a/0002-Revert-Bump-version.patch b/0002-Revert-Bump-version.patch new file mode 100644 index 0000000..5e13e17 --- /dev/null +++ b/0002-Revert-Bump-version.patch @@ -0,0 +1,23 @@ +From dc64876fb0392eb654369718747f8cc55ceea775 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Wed, 23 Jun 2021 08:28:13 +0200 +Subject: [PATCH 2/2] Revert "Bump version" + +This reverts commit f5b1ab0afd5e7ca61e8ea6fbb6f1f273599dd608. +--- + .qmake.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.qmake.conf b/.qmake.conf +index 0057b81..032763c 100644 +--- a/.qmake.conf ++++ b/.qmake.conf +@@ -3,4 +3,4 @@ android|boot2qt: CONFIG -= headersclean + + 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..28acc85 --- /dev/null +++ b/_service @@ -0,0 +1,18 @@ + + + enable + 5.15.2+kde@TAG_OFFSET@ + https://invent.kde.org/qt/qt/qtscript.git + git + qtscript-everywhere-src + kde/5.15 + v5.15.2 + enable + + + + + *.tar + xz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..fc9d3b5 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://invent.kde.org/qt/qt/qtscript.git + 5cec94b2c1503f106f4ef4778d016410ebb86211 \ No newline at end of file diff --git a/libqt5-qtscript.changes b/libqt5-qtscript.changes index 4be782e..8c55efe 100644 --- a/libqt5-qtscript.changes +++ b/libqt5-qtscript.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Jun 22 19:40:05 UTC 2021 - Fabian Vogt + +- Switch to KDE's maintenance branch +- Update to version 5.15.2+kde4: + * Bump version from 5.15.3 to 5.15.4 + * Add product_dependencies.yaml to build against LTS 5.15 + * Add changes file for Qt 5.15.2 + * Bump version +- Add patches to reset version to 5.15.2: + * 0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch + * 0002-Revert-Bump-version.patch + ------------------------------------------------------------------- Fri Nov 20 12:09:33 UTC 2020 - Fabian Vogt diff --git a/libqt5-qtscript.spec b/libqt5-qtscript.spec index 79f808c..fc57cac 100644 --- a/libqt5-qtscript.spec +++ b/libqt5-qtscript.spec @@ -16,14 +16,14 @@ # -%define qt5_snapshot 0 +%define qt5_snapshot 1 %define libname libQt5Script5 %define base_name libqt5 %define real_version 5.15.2 %define so_version 5.15.2 -%define tar_version qtscript-everywhere-src-5.15.2 +%define tar_version qtscript-everywhere-src-%{version} Name: libqt5-qtscript -Version: 5.15.2 +Version: 5.15.2+kde4 Release: 0 Summary: Qt 5 Script library # Legal: @@ -32,21 +32,24 @@ Summary: Qt 5 Script library License: (LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-or-later) AND LGPL-2.0-or-later AND LGPL-2.1-only 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 Source1: baselibs.conf +# PATCH-FIX-OPENSUSE +Patch1: 0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch +Patch2: 0002-Revert-Bump-version.patch # PATCH-FIX-UPSTREAM libqt5-qtscript-s390-support.patch -- adds s390, taken from webkit upstream -Patch1: libqt5-qtscript-s390-support.patch -BuildRequires: libQt5Core-private-headers-devel >= %{version} -BuildRequires: libQt5Widgets-private-headers-devel >= %{version} +Patch3: libqt5-qtscript-s390-support.patch +BuildRequires: libQt5Core-private-headers-devel >= %{real_version} +BuildRequires: libQt5Widgets-private-headers-devel >= %{real_version} %if %{qt5_snapshot} #to create the forwarding headers BuildRequires: perl %endif BuildRequires: pkgconfig BuildRequires: xz -BuildRequires: pkgconfig(Qt5DBus) >= %{version} -BuildRequires: pkgconfig(Qt5Gui) >= %{version} -BuildRequires: pkgconfig(Qt5Widgets) >= %{version} +BuildRequires: pkgconfig(Qt5DBus) >= %{real_version} +BuildRequires: pkgconfig(Qt5Gui) >= %{real_version} +BuildRequires: pkgconfig(Qt5Widgets) >= %{real_version} %description Qt Script is a module for adding scripting to applications. It allows @@ -83,8 +86,8 @@ applications that want to make use of libQt5Script5. Summary: Non-ABI stable experimental API for the Qt5 Script library Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} -Requires: libQt5Core-private-headers-devel >= %{version} -Requires: libQt5Widgets-private-headers-devel >= %{version} +Requires: libQt5Core-private-headers-devel >= %{real_version} +Requires: libQt5Widgets-private-headers-devel >= %{real_version} Provides: libQt5Script-private-headers-devel = %{version} Obsoletes: libQt5Script-private-headers-devel < %{version} BuildArch: noarch diff --git a/qtscript-everywhere-src-5.15.2+kde4.obscpio b/qtscript-everywhere-src-5.15.2+kde4.obscpio new file mode 100644 index 0000000..64c816d --- /dev/null +++ b/qtscript-everywhere-src-5.15.2+kde4.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b89e918ad3066cd228d19274f6a0f2a8689ba7c7d7ff44effad3d19462472357 +size 25936910 diff --git a/qtscript-everywhere-src-5.15.2.tar.xz b/qtscript-everywhere-src-5.15.2.tar.xz deleted file mode 100644 index b248dbc..0000000 --- a/qtscript-everywhere-src-5.15.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e -size 2663016 diff --git a/qtscript-everywhere-src.obsinfo b/qtscript-everywhere-src.obsinfo new file mode 100644 index 0000000..2b93d92 --- /dev/null +++ b/qtscript-everywhere-src.obsinfo @@ -0,0 +1,5 @@ +name: qtscript-everywhere-src +version: 5.15.2+kde4 +mtime: 1615904441 +commit: 5cec94b2c1503f106f4ef4778d016410ebb86211 +