From aaf56a34cda2ab94358ea28096d0d8b15c077c462d46e6410c5a68cbf79643dd Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Tue, 19 Dec 2023 11:01:32 +0000 Subject: [PATCH] Accepting request 1134001 from home:Vogtinator:qt5.15 - Update to 5.15.11: * See individual module packages for changelogs - Drop patches, now upstream: * 0002-Build-fixes-for-GCC-11.patch * 0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch OBS-URL: https://build.opensuse.org/request/show/1134001 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdoc?expand=0&rev=21 --- ...-813a928c7c3cf98670b6043149880ed5c95.patch | 29 ------------- 0002-Build-fixes-for-GCC-11.patch | 43 ------------------- libqt5-qtdoc.changes | 9 ++++ libqt5-qtdoc.spec | 9 ++-- qt-everywhere-opensource-src-5.15.11.tar.xz | 3 ++ qt-everywhere-opensource-src-5.15.9.tar.xz | 3 -- 6 files changed, 15 insertions(+), 81 deletions(-) delete mode 100644 0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch delete mode 100644 0002-Build-fixes-for-GCC-11.patch create mode 100644 qt-everywhere-opensource-src-5.15.11.tar.xz delete mode 100644 qt-everywhere-opensource-src-5.15.9.tar.xz diff --git a/0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch b/0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch deleted file mode 100644 index a15f66a..0000000 --- a/0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 45b201ea42f69510713ddd09fb092ed6f93ad1db Mon Sep 17 00:00:00 2001 -From: Ulf Hermann -Date: Wed, 20 Jan 2021 10:42:36 +0100 -Subject: [PATCH] Partially revert 813a928c7c3cf98670b6043149880ed5c955efb9 - -Otherwise ASAN complains about mismatched new/delete. - -Change-Id: I76ddcc388309e20055c93c68b9b6fa8a11b884e1 -Reviewed-by: Andrei Golubev -Reviewed-by: Ville Voutilainen -(cherry picked from commit 606b03d0a35e71565c3a91588ef2db45b9262e27) ---- - src/corelib/tools/qsharedpointer_impl.h | 3 +++ - 1 file changed, 3 insertions(+) - -Index: qt-everywhere-src-5.15.5/qtbase/src/corelib/tools/qsharedpointer_impl.h -=================================================================== ---- qt-everywhere-src-5.15.5.orig/qtbase/src/corelib/tools/qsharedpointer_impl.h -+++ qt-everywhere-src-5.15.5/qtbase/src/corelib/tools/qsharedpointer_impl.h -@@ -155,6 +155,9 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -+ -+ inline void operator delete(void *ptr) { ::operator delete(ptr); } -+ inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - diff --git a/0002-Build-fixes-for-GCC-11.patch b/0002-Build-fixes-for-GCC-11.patch deleted file mode 100644 index 91552a1..0000000 --- a/0002-Build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 896bcb186161c38965bd002b28156a2aab4b4a76 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH 2/2] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll -Reviewed-by: Thiago Macieira -(cherry picked from commit 813a928c7c3cf98670b6043149880ed5c955efb9) ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -Index: qt-everywhere-src-5.15.5/qtbase/src/corelib/tools/qsharedpointer_impl.h -=================================================================== ---- qt-everywhere-src-5.15.5.orig/qtbase/src/corelib/tools/qsharedpointer_impl.h -+++ qt-everywhere-src-5.15.5/qtbase/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -Index: qt-everywhere-src-5.15.5/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp -=================================================================== ---- qt-everywhere-src-5.15.5.orig/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ qt-everywhere-src-5.15.5/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) diff --git a/libqt5-qtdoc.changes b/libqt5-qtdoc.changes index 7f46c6c..c8fdfdb 100644 --- a/libqt5-qtdoc.changes +++ b/libqt5-qtdoc.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Dec 19 09:46:13 UTC 2023 - Fabian Vogt + +- Update to 5.15.11: + * See individual module packages for changelogs +- Drop patches, now upstream: + * 0002-Build-fixes-for-GCC-11.patch + * 0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch + ------------------------------------------------------------------- Wed Apr 26 20:44:31 UTC 2023 - Jan Engelhardt diff --git a/libqt5-qtdoc.spec b/libqt5-qtdoc.spec index 5fd951b..11fb547 100644 --- a/libqt5-qtdoc.spec +++ b/libqt5-qtdoc.spec @@ -17,19 +17,16 @@ # nodebuginfo -%define real_version 5.15.9 -%define tar_version qt-everywhere-opensource-src-5.15.9 +%define real_version 5.15.11 +%define tar_version qt-everywhere-opensource-src-5.15.11 Name: libqt5-qtdoc -Version: 5.15.9 +Version: 5.15.11 Release: 0 Summary: Qt 5 API Documentation License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 OR LGPL-3.0-only Group: Documentation/Other URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/single/%{tar_version}.tar.xz -# PATCH-FIX-UPSTREAM -Patch2: 0002-Build-fixes-for-GCC-11.patch -Patch3: 0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch # Breaks make_jobs #!BuildIgnore: cmake BuildRequires: alsa-devel diff --git a/qt-everywhere-opensource-src-5.15.11.tar.xz b/qt-everywhere-opensource-src-5.15.11.tar.xz new file mode 100644 index 0000000..37c67d4 --- /dev/null +++ b/qt-everywhere-opensource-src-5.15.11.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7426b1eaab52ed169ce53804bdd05dfe364f761468f888a0f15a308dc1dc2951 +size 660295928 diff --git a/qt-everywhere-opensource-src-5.15.9.tar.xz b/qt-everywhere-opensource-src-5.15.9.tar.xz deleted file mode 100644 index d0cf745..0000000 --- a/qt-everywhere-opensource-src-5.15.9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26d5f36134db03abe4a6db794c7570d729c92a3fc1b0bf9b1c8f86d0573cd02f -size 659840688