Accepting request 902348 from KDE:Qt:5.15
Qt 5.15.2 + KDE patch collection OBS-URL: https://build.opensuse.org/request/show/902348 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtquickcontrols?expand=0&rev=44
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
f32b5121f6
23
0001-Revert-Bump-version.patch
Normal file
23
0001-Revert-Bump-version.patch
Normal file
@ -0,0 +1,23 @@
|
||||
From 8156cabbe480b18577661756813b98d098b6265c Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
Date: Tue, 22 Jun 2021 11:43:53 +0200
|
||||
Subject: [PATCH] Revert "Bump version"
|
||||
|
||||
This reverts commit c8a0b90ca6f42610573c477a6350d27d09464e76.
|
||||
---
|
||||
.qmake.conf | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/.qmake.conf b/.qmake.conf
|
||||
index e708466f..f3d7c57e 100644
|
||||
--- a/.qmake.conf
|
||||
+++ b/.qmake.conf
|
||||
@@ -4,4 +4,4 @@ android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop
|
||||
|
||||
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
18
_service
Normal 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/qtquickcontrols.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">qtquickcontrols-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
4
_servicedata
Normal file
@ -0,0 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://invent.kde.org/qt/qt/qtquickcontrols.git</param>
|
||||
<param name="changesrevision">cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420</param></service></servicedata>
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 22 09:43:53 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Switch to KDE's maintenance branch
|
||||
- Update to version 5.15.2+kde3:
|
||||
* Convert the path to a url correctly
|
||||
* 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:13 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
|
||||
@ -19,34 +19,35 @@
|
||||
# Internal QML imports of examples
|
||||
%global __requires_exclude qmlimport\\(.*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 qtquickcontrols-everywhere-src-5.15.2
|
||||
%define tar_version qtquickcontrols-everywhere-src-%{version}
|
||||
Name: libqt5-qtquickcontrols
|
||||
Version: 5.15.2
|
||||
Version: 5.15.2+kde3
|
||||
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: fix-handle-deps.patch
|
||||
Patch2: 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
|
||||
|
||||
@ -63,8 +64,7 @@ Group: Development/Libraries/X11
|
||||
Examples for libqt5-qtquickcontrols module.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{tar_version}
|
||||
%autopatch -p1
|
||||
%autosetup -p1 -n %{tar_version}
|
||||
|
||||
%build
|
||||
%if %{qt5_snapshot}
|
||||
|
||||
3
qtquickcontrols-everywhere-src-5.15.2+kde3.obscpio
Normal file
3
qtquickcontrols-everywhere-src-5.15.2+kde3.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:168b235b2f8f11e29ac8f29d2ac26f4fec5dc0594d42e9ac9cffdf6fa40f946a
|
||||
size 11803150
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5
|
||||
size 5982344
|
||||
5
qtquickcontrols-everywhere-src.obsinfo
Normal file
5
qtquickcontrols-everywhere-src.obsinfo
Normal file
@ -0,0 +1,5 @@
|
||||
name: qtquickcontrols-everywhere-src
|
||||
version: 5.15.2+kde3
|
||||
mtime: 1605012934
|
||||
commit: cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420
|
||||
|
||||
Loading…
Reference in New Issue
Block a user