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.
This commit is contained in:
parent
54c3521c2c
commit
854e4ba061
2 changed files with 19 additions and 1 deletions
18
srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch
Normal file
18
srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch
Normal file
|
@ -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
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'wxWidgets-gtk3'
|
# Template file for 'wxWidgets-gtk3'
|
||||||
pkgname=wxWidgets-gtk3
|
pkgname=wxWidgets-gtk3
|
||||||
version=3.0.5.1
|
version=3.0.5.1
|
||||||
revision=2
|
revision=3
|
||||||
wrksrc="wxWidgets-${version}"
|
wrksrc="wxWidgets-${version}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl
|
configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue