Accepting request 985495 from KDE:Qt:5.15
Qt 5.15.5 with patch collection + qtscript 5.15.10 (forwarded request 985459 from favogt) OBS-URL: https://build.opensuse.org/request/show/985495 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qttools?expand=0&rev=54
This commit is contained in:
commit
82a6239a56
@ -1,23 +0,0 @@
|
||||
From 8a2e60a7486d7f31c487efb7a0108743ed54c6fb Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
Date: Tue, 22 Jun 2021 21:35:06 +0200
|
||||
Subject: [PATCH] Revert "Bump version"
|
||||
|
||||
This reverts commit dbe0567470db2b369a9fdb28d9fbac38be3e2d60.
|
||||
---
|
||||
.qmake.conf | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/.qmake.conf b/.qmake.conf
|
||||
index 05561703..6ec606e7 100644
|
||||
--- a/.qmake.conf
|
||||
+++ b/.qmake.conf
|
||||
@@ -2,4 +2,4 @@ load(qt_build_config)
|
||||
|
||||
DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
|
||||
|
||||
-MODULE_VERSION = 5.15.3
|
||||
+MODULE_VERSION = 5.15.2
|
||||
--
|
||||
2.20.1
|
||||
|
4
_service
4
_service
@ -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/qttools.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">qttools-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"/>
|
||||
|
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 27 13:10:31 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to version 5.15.5+kde1, rebased upstream:
|
||||
* Ensure FileAttributeSetTable is filled ordered so we get the same qch file each time
|
||||
* Fix regression in lconvert handling empty translations
|
||||
* Qt Designer: Fix alignment when adding new QTableWidget columns
|
||||
* Qt Designer: Fix alignment of horizontal QTableWidget headers
|
||||
* Qt Designer: Fix saving of item view header visibility on page based containers
|
||||
* Qt Designer: Slow down wheel scrolling of the widget box
|
||||
* Revert "Update commercial license headers"
|
||||
* QDoc: Fix possible crash in WebXMLGenerator
|
||||
* Fix check for malformed input when decoding translations
|
||||
* Fix redeclared variable name
|
||||
* qdoc: Allow any type of page as qhp indexTitle
|
||||
* qdoc: Don't clear the warning count in single-exec mode
|
||||
* Bump copyright year to 2021
|
||||
* qdoc: Fix generation of TOC for basic QML/JS types
|
||||
* Update commercial license headers
|
||||
* qdoc: Fix addendums for QML signals that contain '.' in the name
|
||||
* qdoc: Ignore empty example meta tags
|
||||
* qdoc: Fix breadcrumb generation for normal page nodes
|
||||
- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 22 19:35:06 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
|
@ -18,8 +18,8 @@
|
||||
|
||||
%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 qttools-everywhere-src-%{version}
|
||||
%if 0%{?suse_version} >= 1330
|
||||
%bcond_without qdoc
|
||||
@ -28,7 +28,7 @@
|
||||
%bcond_with qdoc
|
||||
%endif
|
||||
Name: libqt5-qttools
|
||||
Version: 5.15.2+kde17
|
||||
Version: 5.15.5+kde1
|
||||
Release: 0
|
||||
Summary: Qt 5 QtTools Module
|
||||
# Legal:
|
||||
@ -47,8 +47,6 @@ Source12: linguist5.desktop
|
||||
Source13: assistant5.desktop
|
||||
Source14: qdbusviewer5.desktop
|
||||
Source99: libqt5-qttools-rpmlintrc
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch1: 0001-Revert-Bump-version.patch
|
||||
%if %{with qdoc}
|
||||
BuildRequires: clang-devel >= 3.9.0
|
||||
%endif
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8598c8aedcd7d7a0e405c238703cc092e13cfddd8cccdc4dce761940ef0676ad
|
||||
size 51978767
|
3
qttools-everywhere-src-5.15.5+kde1.obscpio
Normal file
3
qttools-everywhere-src-5.15.5+kde1.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:14d4896c8f0408947a0a656898aff1e39f0dd9d2ec8169f8a04f010400f8a65b
|
||||
size 51988494
|
@ -1,5 +1,4 @@
|
||||
name: qttools-everywhere-src
|
||||
version: 5.15.2+kde17
|
||||
mtime: 1606896391
|
||||
commit: 33693a928986006d79c1ee743733cde5966ac402
|
||||
|
||||
version: 5.15.5+kde1
|
||||
mtime: 1655652678
|
||||
commit: 672ba9d902be3634a9fef80be65227aece9e0aed
|
||||
|
Loading…
Reference in New Issue
Block a user