diff --git a/0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch b/0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch new file mode 100644 index 0000000..d6b1a5c --- /dev/null +++ b/0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch @@ -0,0 +1,32 @@ +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(+) + +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 + diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes index 9b2cf3f..e1f75ec 100644 --- a/libqt5-qtbase.changes +++ b/libqt5-qtbase.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 13 07:06:06 UTC 2021 - Fabian Vogt + +- 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 diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec index 6ef3233..47681e7 100644 --- a/libqt5-qtbase.spec +++ b/libqt5-qtbase.spec @@ -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++