summarylogtreecommitdiffstats
path: root/make-abicheck-non-fatal.patch
diff options
context:
space:
mode:
authorsl1pkn072015-06-08 21:11:39 +0200
committersl1pkn072015-06-08 21:11:39 +0200
commit15422887dc23f4b0ecc30d7b2706a2853a87eced (patch)
tree4d8b1ed62bc6c2db1427f1a1f0008ce2ea352170 /make-abicheck-non-fatal.patch
downloadaur-15422887dc23f4b0ecc30d7b2706a2853a87eced.tar.gz
Initial commit
Diffstat (limited to 'make-abicheck-non-fatal.patch')
-rw-r--r--make-abicheck-non-fatal.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/make-abicheck-non-fatal.patch b/make-abicheck-non-fatal.patch
new file mode 100644
index 000000000000..97055ba46fad
--- /dev/null
+++ b/make-abicheck-non-fatal.patch
@@ -0,0 +1,15 @@
+diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp
+--- wxGTK-2.8.12/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100
++++ wxGTK-2.8.12/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
+