diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 264e84a..9c00ab2 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -53,7 +53,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.15.2 -Release: 11%{?dist} +Release: 12%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -105,6 +105,8 @@ Patch27: qtwebengine-gcc11.patch Patch28: qtwebengine-everywhere-src-5.15.2-#1904652.patch # Fix sandbox issue on 32-bit architectures with glibc >= 2.31 (from Debian) Patch29: qtwebengine-everywhere-src-5.15.2-sandbox-time64-syscalls.patch +# Fix FTBFS with latest glibc, https://bugzilla.redhat.com/show_bug.cgi?id=1945595 +Patch30: qtwebengine-everywhere-5.15.2-SIGSTKSZ.patch ## Upstream patches: @@ -414,6 +416,7 @@ popd %patch27 -p1 -b .gcc11 %patch28 -p1 -b .rh#1904652 %patch29 -p1 -b .sandbox-time64-syscalls +%patch30 -p1 -b .SIGSTKSZ # the xkbcommon config/feature was renamed in 5.12, so need to adjust QT_CONFIG references # when building on older Qt releases @@ -644,6 +647,9 @@ done %changelog +* Wed Jun 16 2021 Rex Dieter - 5.15.2-12 +- workaround SIGSTKSZ FTBFS (#19455950 + * Thu May 20 2021 Pete Walter - 5.15.2-11 - Rebuild for ICU 69 diff --git a/qtwebengine-everywhere-5.15.2-SIGSTKSZ.patch b/qtwebengine-everywhere-5.15.2-SIGSTKSZ.patch new file mode 100644 index 0000000..44b6c87 --- /dev/null +++ b/qtwebengine-everywhere-5.15.2-SIGSTKSZ.patch @@ -0,0 +1,12 @@ +diff -up qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.SIGSTKSZ qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +--- qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.SIGSTKSZ 2020-11-06 19:22:36.000000000 -0600 ++++ qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2021-06-16 09:20:00.175193987 -0500 +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small.