SLFO-pool/libqt5-qtdoc
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main libqt5-qtdoc revision 3efc83ea4207c6b2d37da2c3429dd188

Browse Source
This commit is contained in:
Adrian Schröter 2024-08-21 17:11:58 +02:00
parent b5a3358186
commit 7ca333f310
6 changed files with 21 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch
View File

@ -1,29 +0,0 @@
From 45b201ea42f69510713ddd09fb092ed6f93ad1db Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
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 <andrei.golubev@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(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)

43
0002-Build-fixes-for-GCC-11.patch
View File

@ -1,43 +0,0 @@
From 896bcb186161c38965bd002b28156a2aab4b4a76 Mon Sep 17 00:00:00 2001
From: Ville Voutilainen <ville.voutilainen@qt.io>
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 <lars.knoll@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(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<const QXcbWindow *>(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)

15
libqt5-qtdoc.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Fri Dec 29 15:43:50 UTC 2023 - Fabian Vogt <fvogt@suse.com>
- Update to 5.15.12:
* See individual module packages for changelogs
-------------------------------------------------------------------
Tue Dec 19 09:46:13 UTC 2023 - Fabian Vogt <fvogt@suse.com>
- 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 <jengelh@inai.de>

9
libqt5-qtdoc.spec
View File

@ -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.12
%define tar_version qt-everywhere-opensource-src-5.15.12
Name: libqt5-qtdoc
Version: 5.15.9
Version: 5.15.12
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

BIN
qt-everywhere-opensource-src-5.15.12.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
qt-everywhere-opensource-src-5.15.9.tar.xz (Stored with Git LFS)
View File

Binary file not shown.