diff --git a/catch1-sigstksz.patch b/catch1-sigstksz.patch new file mode 100644 index 0000000..e92a744 --- /dev/null +++ b/catch1-sigstksz.patch @@ -0,0 +1,68 @@ +commit 34650cd9ea2f7e4aa1e61b84ecf9913b87870680 +Author: Tom Hughes +Date: Fri Feb 19 10:45:49 2021 +0000 + + Patch for non-constant SIGSTKSZ + +diff --git a/include/internal/catch_fatal_condition.hpp b/include/internal/catch_fatal_condition.hpp +index 1dcd545d..f7d9e10d 100644 +--- a/3rdparty/catch/include/internal/catch_fatal_condition.hpp ++++ b/3rdparty/catch/include/internal/catch_fatal_condition.hpp +@@ -136,7 +136,7 @@ namespace Catch { + static bool isSet; + static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; + static stack_t oldSigStack; +- static char altStackMem[SIGSTKSZ]; ++ static char altStackMem[32768]; + + static void handleSignal( int sig ) { + std::string name = ""; +@@ -156,7 +156,7 @@ namespace Catch { + isSet = true; + stack_t sigStack; + sigStack.ss_sp = altStackMem; +- sigStack.ss_size = SIGSTKSZ; ++ sigStack.ss_size = 32768; + sigStack.ss_flags = 0; + sigaltstack(&sigStack, &oldSigStack); + struct sigaction sa = { 0 }; +@@ -188,7 +188,7 @@ namespace Catch { + bool FatalConditionHandler::isSet = false; + struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; + stack_t FatalConditionHandler::oldSigStack = {}; +- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; ++ char FatalConditionHandler::altStackMem[32768] = {}; + + + } // namespace Catch +diff --git a/single_include/catch.hpp b/single_include/catch.hpp +index fdb046fe..d64fd1a5 100644 +--- a/3rdparty/catch/single_include/catch.hpp ++++ b/3rdparty/catch/single_include/catch.hpp +@@ -6540,7 +6540,7 @@ namespace Catch { + static bool isSet; + static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; + static stack_t oldSigStack; +- static char altStackMem[SIGSTKSZ]; ++ static char altStackMem[32768]; + + static void handleSignal( int sig ) { + std::string name = ""; +@@ -6560,7 +6560,7 @@ namespace Catch { + isSet = true; + stack_t sigStack; + sigStack.ss_sp = altStackMem; +- sigStack.ss_size = SIGSTKSZ; ++ sigStack.ss_size = 32768; + sigStack.ss_flags = 0; + sigaltstack(&sigStack, &oldSigStack); + struct sigaction sa = { 0 }; +@@ -6591,7 +6591,7 @@ namespace Catch { + bool FatalConditionHandler::isSet = false; + struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; + stack_t FatalConditionHandler::oldSigStack = {}; +- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; ++ char FatalConditionHandler::altStackMem[32768] = {}; + + } // namespace Catch + diff --git a/wxGTK.spec b/wxGTK.spec index 8b83c0e..9b97084 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -5,7 +5,7 @@ Name: wxGTK Version: 3.1.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets URL: https://www.wxwidgets.org/ @@ -19,6 +19,7 @@ Patch0: %{name}-3.0.3-abicheck.patch Patch1: disable-tests-failing-mock.patch Patch2: fix-webview-tests.patch Patch3: skip-test-s390x.patch +Patch4: catch1-sigstksz.patch BuildRequires: make BuildRequires: gcc-c++ @@ -303,6 +304,9 @@ fi %doc html %changelog +* Thu Mar 04 2021 Scott Talbert - 3.1.4-5 +- Fix FTBFS due to glibc non-const SIGSTKSZ + * Wed Mar 03 2021 Peter Hutterer 3.1.4-4 - Require only xclock, not all of xorg-x11-apps (#1934359)