From 0f20acbc3d97610fb5379d446a3b60ca1a888231ef50ef9282a911609a3fa6b0 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 28 Jun 2022 08:21:07 +0000 Subject: [PATCH] Qt 5.15.5 with patch collection + qtscript 5.15.10 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtcharts?expand=0&rev=13 --- 0001-Revert-Bump-version.patch | 23 --------------------- _service | 4 ++-- libqt5-qtcharts.changes | 15 ++++++++++++++ libqt5-qtcharts.spec | 8 +++---- qtcharts-everywhere-src-5.15.2+kde2.obscpio | 3 --- qtcharts-everywhere-src-5.15.5+kde1.obscpio | 3 +++ qtcharts-everywhere-src.obsinfo | 7 +++---- 7 files changed, 26 insertions(+), 37 deletions(-) delete mode 100644 0001-Revert-Bump-version.patch delete mode 100644 qtcharts-everywhere-src-5.15.2+kde2.obscpio create mode 100644 qtcharts-everywhere-src-5.15.5+kde1.obscpio diff --git a/0001-Revert-Bump-version.patch b/0001-Revert-Bump-version.patch deleted file mode 100644 index a44d9ff..0000000 --- a/0001-Revert-Bump-version.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b761c608a49f50fdf43b18ebfecb2fd2dc8fe32c Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Tue, 22 Jun 2021 21:38:47 +0200 -Subject: [PATCH] Revert "Bump version" - -This reverts commit 73c1a5618e6af310b0146398b8ed27b716926d09. ---- - .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 - diff --git a/_service b/_service index 9b16652..349f43c 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ enable - 5.15.2+kde@TAG_OFFSET@ + 5.15.5+kde@TAG_OFFSET@ https://invent.kde.org/qt/qt/qtcharts.git git qtcharts-everywhere-src kde/5.15 - v5.15.2 + v5.15.5-lts-lgpl enable diff --git a/libqt5-qtcharts.changes b/libqt5-qtcharts.changes index d8377d5..0a5acc4 100644 --- a/libqt5-qtcharts.changes +++ b/libqt5-qtcharts.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Jun 27 13:09:11 UTC 2022 - Fabian Vogt + +- Update to version 5.15.5+kde1, rebased upstream: + * Revert "Fix X axis labels to not draw over each other" + * Fix X axis labels to not draw over each other + * Add comments and clarify some code + * Add text bounds cache + * Revert "Update the commercial license header to Qt Charts files" + * Doc: Fix issues in Q[H|V]XYModelMapper documentation + * Only create the GLXYSeriesData if there is no existing data + * Update the commercial license header to Qt Charts files + * QtCharts: Append branch condition fix in QLegend +- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now + ------------------------------------------------------------------- Tue Jun 22 19:38:47 UTC 2021 - Fabian Vogt diff --git a/libqt5-qtcharts.spec b/libqt5-qtcharts.spec index bcfd441..12cc936 100644 --- a/libqt5-qtcharts.spec +++ b/libqt5-qtcharts.spec @@ -19,19 +19,17 @@ %define qt5_snapshot 1 %define libname libQt5Charts5 %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 qtcharts-everywhere-src-%{version} Name: libqt5-qtcharts -Version: 5.15.2+kde2 +Version: 5.15.5+kde1 Release: 0 Summary: Qt 5 Charts Library License: GPL-3.0-or-later Group: Development/Libraries/C and C++ URL: https://doc.qt.io/qt-5/qtcharts-index.html Source: %{tar_version}.tar.xz -# PATCH-FIX-OPENSUSE -Patch1: 0001-Revert-Bump-version.patch BuildRequires: fdupes BuildRequires: libqt5-qtdeclarative-devel >= %{real_version} %if %{qt5_snapshot} diff --git a/qtcharts-everywhere-src-5.15.2+kde2.obscpio b/qtcharts-everywhere-src-5.15.2+kde2.obscpio deleted file mode 100644 index ac4699d..0000000 --- a/qtcharts-everywhere-src-5.15.2+kde2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a60da5b890cb2d5a8d2683bd8865fe5a23cf7ccbf16b6a1f5efe5de6effbd3e2 -size 9534990 diff --git a/qtcharts-everywhere-src-5.15.5+kde1.obscpio b/qtcharts-everywhere-src-5.15.5+kde1.obscpio new file mode 100644 index 0000000..c3a565c --- /dev/null +++ b/qtcharts-everywhere-src-5.15.5+kde1.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5ca9c779b1eede28604d37516a5aa35862b8f087f01d1532e82778a5dd1cc95 +size 9541133 diff --git a/qtcharts-everywhere-src.obsinfo b/qtcharts-everywhere-src.obsinfo index a0e59ab..c5fc9bb 100644 --- a/qtcharts-everywhere-src.obsinfo +++ b/qtcharts-everywhere-src.obsinfo @@ -1,5 +1,4 @@ name: qtcharts-everywhere-src -version: 5.15.2+kde2 -mtime: 1603963521 -commit: 130463160b4923069eb98da49edaf7d93180f4f8 - +version: 5.15.5+kde1 +mtime: 1655461950 +commit: 9a569795f0c3f41ec093e4aa5842a463e2755edb