From 2e8e497e637a2fe13947947a82f642e68c7a49ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 22 Jan 2021 17:13:15 -0300 Subject: [PATCH] wxWidgets: add patch so ABI mismatch errors aren't fatal. Same explanation as wxWidgets-gtk3 from the previous commit. --- .../wxWidgets/patches/nonfatal-abi-check.patch | 18 ++++++++++++++++++ srcpkgs/wxWidgets/template | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch diff --git a/srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch b/srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch new file mode 100644 index 00000000000..8a2bd584532 --- /dev/null +++ b/srcpkgs/wxWidgets/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/template b/srcpkgs/wxWidgets/template index 6cca7f994f2..bd43970594d 100644 --- a/srcpkgs/wxWidgets/template +++ b/srcpkgs/wxWidgets/template @@ -1,7 +1,7 @@ # Template file for 'wxWidgets' pkgname=wxWidgets version=3.0.5.1 -revision=2 +revision=3 configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack --with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview" build_style=gnu-configure