rpm/libqt5-qtbase
SHA256
1
0
Fork 0
forked from pool/libqt5-qtbase
Code Pull Requests Activity

Accepting request 884857 from home:Vogtinator:qt5.15

Browse Source 
- Add patch to fix possible crash caused by GCC 11 build fix:
  * 0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch

OBS-URL: https://build.opensuse.org/request/show/884857
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtbase?expand=0&rev=24
This commit is contained in:
Christophe Giboudeaux 2021-04-13 07:58:57 +00:00 committed by Git OBS Bridge
parent a9c4fe9681
commit 660b5710f7
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch Normal file
View File

@ -0,0 +1,32 @@
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(+)
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index 4aee98af53..790c187cb9 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/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)
--
2.25.1

6
libqt5-qtbase.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 13 07:06:06 UTC 2021 - Fabian Vogt <fvogt@suse.com>
- Add patch to fix possible crash caused by GCC 11 build fix:
* 0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch
-------------------------------------------------------------------
Mon Feb 8 09:16:47 UTC 2021 - Fabian Vogt <fvogt@suse.com>

1
libqt5-qtbase.spec
View File

@ -72,6 +72,7 @@ Patch1001: 0001-Let-QXcbConnection-getTimestamp-properly-exit-when-X.patch
Patch2001: 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch
Patch2002: 0001-Fix-build-with-GCC-11-include-limits.patch
Patch2003: 0002-Build-fixes-for-GCC-11.patch
Patch2004: 0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch
BuildRequires: cups-devel
BuildRequires: double-conversion-devel
BuildRequires: gcc-c++