wxWidgets: add patch so ABI mismatch errors aren't fatal.
Same explanation as wxWidgets-gtk3 from the previous commit.
This commit is contained in:
parent
854e4ba061
commit
2e8e497e63
|
@ -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'
|
# Template file for 'wxWidgets'
|
||||||
pkgname=wxWidgets
|
pkgname=wxWidgets
|
||||||
version=3.0.5.1
|
version=3.0.5.1
|
||||||
revision=2
|
revision=3
|
||||||
configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack
|
configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack
|
||||||
--with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview"
|
--with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
|
|
Loading…
Reference in New Issue