diff options
| author | Britney Fransen <brfransen@gmail.com> | 2016-05-16 16:24:28 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2016-05-16 16:24:28 (GMT) |
| commit | fff4c50d3a1d94c807604d6c21355993dfb95c85 (patch) | |
| tree | 390f0eb0781b2599449edbdafbeb6aaba34200dc /abs/extra/wxgtk/make-abicheck-non-fatal.patch | |
| parent | 8de064f6e96f960cdbfe6868d9957a4613f704df (diff) | |
| parent | 6f7a84649ef75069cc4fa06fabeb63e762e049d1 (diff) | |
| download | linhes_pkgbuild-fff4c50d3a1d94c807604d6c21355993dfb95c85.zip linhes_pkgbuild-fff4c50d3a1d94c807604d6c21355993dfb95c85.tar.gz linhes_pkgbuild-fff4c50d3a1d94c807604d6c21355993dfb95c85.tar.bz2 | |
Merge branch 'testing'
Diffstat (limited to 'abs/extra/wxgtk/make-abicheck-non-fatal.patch')
| -rw-r--r-- | abs/extra/wxgtk/make-abicheck-non-fatal.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/abs/extra/wxgtk/make-abicheck-non-fatal.patch b/abs/extra/wxgtk/make-abicheck-non-fatal.patch new file mode 100644 index 0000000..97055ba --- /dev/null +++ b/abs/extra/wxgtk/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 + |