1
0
Christophe Giboudeaux 2021-06-24 12:00:33 +00:00 committed by Git OBS Bridge
parent 056931b2f4
commit 961d58e322
9 changed files with 104 additions and 15 deletions

View File

@ -0,0 +1,23 @@
From 356ec23ba0d96855d9a33bc1abd51977b336e962 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.de>
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

View File

@ -0,0 +1,23 @@
From dc64876fb0392eb654369718747f8cc55ceea775 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.de>
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

18
_service Normal file
View File

@ -0,0 +1,18 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
<param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
<param name="url">https://invent.kde.org/qt/qt/qtscript.git</param>
<param name="scm">git</param>
<param name="filename">qtscript-everywhere-src</param>
<param name="revision">kde/5.15</param>
<param name="parent-tag">v5.15.2</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
</services>

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://invent.kde.org/qt/qt/qtscript.git</param>
<param name="changesrevision">5cec94b2c1503f106f4ef4778d016410ebb86211</param></service></servicedata>

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Jun 22 19:40:05 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- 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 <fabian@ritter-vogt.de>

View File

@ -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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b89e918ad3066cd228d19274f6a0f2a8689ba7c7d7ff44effad3d19462472357
size 25936910

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e
size 2663016

View File

@ -0,0 +1,5 @@
name: qtscript-everywhere-src
version: 5.15.2+kde4
mtime: 1615904441
commit: 5cec94b2c1503f106f4ef4778d016410ebb86211