Qt 5.15.5 with patch collection + qtscript 5.15.10

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtquickcontrols?expand=0&rev=14
This commit is contained in:
Christophe Giboudeaux 2022-06-28 08:21:42 +00:00 committed by Git OBS Bridge
parent 88e3f11266
commit ff740d4250
7 changed files with 23 additions and 36 deletions

View File

@ -1,23 +0,0 @@
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

View File

@ -1,12 +1,12 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
<param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
<param name="versionformat">5.15.5+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="parent-tag">v5.15.5-lts-lgpl</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Jun 27 13:09:59 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to version 5.15.5+kde0, rebased upstream:
* Fix warning with QML FileDialog with many files
* Revert "Update commercial license headers"
* Update commercial license headers
* ColorDialog: Set the options before the current color on the helper
* [Android] Fix CheckBox rtl issues
* [Android] Fix FontDialog layout issues
- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
-------------------------------------------------------------------
Tue Jun 22 09:43:53 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -21,11 +21,11 @@
%define qt5_snapshot 1
%define base_name libqt5
%define real_version 5.15.2
%define so_version 5.15.2
%define real_version 5.15.5
%define so_version 5.15.5
%define tar_version qtquickcontrols-everywhere-src-%{version}
Name: libqt5-qtquickcontrols
Version: 5.15.2+kde3
Version: 5.15.5+kde0
Release: 0
Summary: Qt 5 Quick Controls Addon
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
@ -34,7 +34,6 @@ URL: https://www.qt.io
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 >= %{real_version}
BuildRequires: libQt5Gui-private-headers-devel >= %{real_version}

View File

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

View File

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

View File

@ -1,5 +1,4 @@
name: qtquickcontrols-everywhere-src
version: 5.15.2+kde3
mtime: 1605012934
commit: cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420
version: 5.15.5+kde0
mtime: 1652901326
commit: 4fb4e5942bfa1f92f1c759f182aa504ad52e8e3b