From c9f7023a2ca233c5e49805050ead60fbb0e682a386137dbfa95449b02eabff50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 21 Aug 2024 17:16:24 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main libqt5-qttools revision 0a83370b1e145759a36f318277f6622a --- _service | 4 ++-- _servicedata | 2 +- libqt5-qttools.changes | 7 +++++++ libqt5-qttools.spec | 6 +++--- qttools-everywhere-src-5.15.11+kde3.obscpio | 3 --- qttools-everywhere-src-5.15.12+kde4.obscpio | 3 +++ qttools-everywhere-src.obsinfo | 6 +++--- 7 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 qttools-everywhere-src-5.15.11+kde3.obscpio create mode 100644 qttools-everywhere-src-5.15.12+kde4.obscpio diff --git a/_service b/_service index 8d57d84..8d5426c 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ enable - 5.15.11+kde@TAG_OFFSET@ + 5.15.12+kde@TAG_OFFSET@ https://invent.kde.org/qt/qt/qttools.git git qttools-everywhere-src kde/5.15 - v5.15.11-lts-lgpl + v5.15.12-lts-lgpl enable diff --git a/_servicedata b/_servicedata index fa979e7..8c94bf3 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://invent.kde.org/qt/qt/qttools.git - 38ae810be3fb4984f75b55a16d3413e35d701af1 \ No newline at end of file + bd0ceb7de5d0c918ae596150e95b069dca8b9150 \ No newline at end of file diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index b765c80..76cce5b 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 29 13:31:38 UTC 2023 - Fabian Vogt + +- Update to version 5.15.12+kde4, rebased upstream: + * qdoc: Ensure the generated temporary header file is closed properly + * Bump version to 5.15.12 + ------------------------------------------------------------------- Fri Oct 6 06:43:06 UTC 2023 - Fabian Vogt diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index 074e822..0056d8c 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -18,8 +18,8 @@ %define qt5_snapshot 1 %define base_name libqt5 -%define real_version 5.15.11 -%define so_version 5.15.11 +%define real_version 5.15.12 +%define so_version 5.15.12 %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.11+kde3 +Version: 5.15.12+kde4 Release: 0 Summary: Qt 5 QtTools Module # Legal: diff --git a/qttools-everywhere-src-5.15.11+kde3.obscpio b/qttools-everywhere-src-5.15.11+kde3.obscpio deleted file mode 100644 index c13dbb0..0000000 --- a/qttools-everywhere-src-5.15.11+kde3.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a62dde19baca2bb7bedb4fc277d542130bb518e6664acea881c29dc716c73023 -size 52001294 diff --git a/qttools-everywhere-src-5.15.12+kde4.obscpio b/qttools-everywhere-src-5.15.12+kde4.obscpio new file mode 100644 index 0000000..6ddbadc --- /dev/null +++ b/qttools-everywhere-src-5.15.12+kde4.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a4410d910137d45c2df6b7d42d3fee6bf9469e0886ddc1c23a61de53a968ddb +size 52001294 diff --git a/qttools-everywhere-src.obsinfo b/qttools-everywhere-src.obsinfo index d62ea0c..07a63a9 100644 --- a/qttools-everywhere-src.obsinfo +++ b/qttools-everywhere-src.obsinfo @@ -1,4 +1,4 @@ name: qttools-everywhere-src -version: 5.15.11+kde3 -mtime: 1696453139 -commit: 38ae810be3fb4984f75b55a16d3413e35d701af1 +version: 5.15.12+kde4 +mtime: 1703803159 +commit: bd0ceb7de5d0c918ae596150e95b069dca8b9150