From 854e4ba0613811ede1412888d63ada3b348938a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 22 Jan 2021 16:31:26 -0300 Subject: [PATCH] wxWidgets-gtk3: add patch so ABI mismatch errors aren't fatal. The version string used by wx to check for a "compatible" ABI includes the C++ ABI, which changed between GCC 9 and 10 (1013 and 1014, respectively). This made it so launching a program built with GCC 10 with wxWidgets built with GCC 9 failed. Once wxWidgets was rebuilt with GCC 10, applications built with GCC 9 would be the ones to fail. --- .../patches/nonfatal-abi-check.patch | 18 ++++++++++++++++++ srcpkgs/wxWidgets-gtk3/template | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch diff --git a/srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch b/srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch new file mode 100644 index 00000000000..8a2bd584532 --- /dev/null +++ b/srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch @@ -0,0 +1,18 @@ +Taken from +https://github.com/archlinux/svntogit-packages/blob/71ee17d529f8e0dc5c44d2fffb0dfa69b71daa0b/repos/extra-x86_64/make-abicheck-non-fatal.patch + +diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp +--- src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100 ++++ src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100 +@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con + msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), + lib.c_str(), progName.c_str(), prog.c_str()); + +- wxLogFatalError(msg.c_str()); +- +- // normally wxLogFatalError doesn't return +- return false; ++ wxLogWarning(msg.c_str()); + } + #undef wxCMP + diff --git a/srcpkgs/wxWidgets-gtk3/template b/srcpkgs/wxWidgets-gtk3/template index e1424cb4772..1081bc8853d 100644 --- a/srcpkgs/wxWidgets-gtk3/template +++ b/srcpkgs/wxWidgets-gtk3/template @@ -1,7 +1,7 @@ # Template file for 'wxWidgets-gtk3' pkgname=wxWidgets-gtk3 version=3.0.5.1 -revision=2 +revision=3 wrksrc="wxWidgets-${version}" build_style=gnu-configure configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl