Date: Monday, June 12, 2017 @ 17:53:00 Author: arojas Revision: 298707
archrelease: copy trunk to extra-i686, extra-x86_64 Added: wxgtk/repos/extra-i686/PKGBUILD (from rev 298706, wxgtk/trunk/PKGBUILD) wxgtk/repos/extra-i686/make-abicheck-non-fatal.patch (from rev 298706, wxgtk/trunk/make-abicheck-non-fatal.patch) wxgtk/repos/extra-x86_64/PKGBUILD (from rev 298706, wxgtk/trunk/PKGBUILD) wxgtk/repos/extra-x86_64/make-abicheck-non-fatal.patch (from rev 298706, wxgtk/trunk/make-abicheck-non-fatal.patch) Deleted: wxgtk/repos/extra-i686/PKGBUILD wxgtk/repos/extra-i686/make-abicheck-non-fatal.patch wxgtk/repos/extra-x86_64/PKGBUILD wxgtk/repos/extra-x86_64/make-abicheck-non-fatal.patch --------------------------------------------+ /PKGBUILD | 190 +++++++++++++++++++++++++++ /make-abicheck-non-fatal.patch | 30 ++++ extra-i686/PKGBUILD | 91 ------------ extra-i686/make-abicheck-non-fatal.patch | 15 -- extra-x86_64/PKGBUILD | 91 ------------ extra-x86_64/make-abicheck-non-fatal.patch | 15 -- 6 files changed, 220 insertions(+), 212 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-06-12 17:52:23 UTC (rev 298706) +++ extra-i686/PKGBUILD 2017-06-12 17:53:00 UTC (rev 298707) @@ -1,91 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgbase=wxgtk -pkgname=(wxgtk2 wxgtk3 wxgtk-common) -pkgver=3.0.3.1 -pkgrel=5 -arch=('i686' 'x86_64') -url="https://wxwidgets.org" -license=('custom:wxWindows') -makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu' 'webkit2gtk' 'libnotify') -options=('!emptydirs') -source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2 - make-abicheck-non-fatal.patch wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch") -sha1sums=('ea785822d0f1c3290707bda6da570e596b3ec85a' - 'dfe38650c655395b90bf082b5734c4093508bfa3' - 'c9d013552b3078d7a9700df897333c2960207b0f') - -prepare() { - cd wxWidgets-${pkgver} - - # C++ ABI check is too strict and breaks with GCC 5.1 - # https://bugzilla.redhat.com/show_bug.cgi?id=1200611 - patch -Np1 -i ../make-abicheck-non-fatal.patch - - # Support webkit2gtk - sed -e 's|setup0.h|setup.h|g' -i ../wxgtk-webkit2gtk.patch - patch -p1 -i ../wxgtk-webkit2gtk.patch - - cd .. - cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3 -} - -build() { - cd wxWidgets-${pkgver} - ./autogen.sh - ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ - --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ - --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ - --disable-precomp-headers - make - make -C locale allmo - - cd ../wxWidgets-${pkgver}-gtk3 - ./autogen.sh - ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=3 --with-opengl --enable-unicode \ - --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ - --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ - --disable-precomp-headers - make -} - -package_wxgtk-common() { - pkgdesc='Common libraries and headers for wxgtk2 and wxgtk3' - depends=('zlib' 'gcc-libs' 'expat') - - cd wxWidgets-${pkgver} - make DESTDIR="${pkgdir}" install - rm -r "$pkgdir"/usr/{bin/wx-config,lib/{wx,libwx_gtk*}} - - install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_wxgtk2() { - pkgdesc='GTK+2 implementation of wxWidgets API for GUI' - depends=('gtk2' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify') - optdepends=('webkitgtk2: for webview support') - conflicts=('wxgtk') - provides=('wxgtk') - replaces=('wxgtk') - - cd wxWidgets-${pkgver} - make DESTDIR="${pkgdir}" install - rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*} - - install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_wxgtk3() { - pkgdesc='GTK+3 implementation of wxWidgets API for GUI' - depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify') - optdepends=('webkit2gtk: for webview support') - conflicts=('wxgtk<3.0.3.1-2') - - cd wxWidgets-${pkgver}-gtk3 - make DESTDIR="${pkgdir}" install - rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*} - mv "$pkgdir"/usr/bin/wx-config{,-gtk3} - - install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: wxgtk/repos/extra-i686/PKGBUILD (from rev 298706, wxgtk/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-06-12 17:53:00 UTC (rev 298707) @@ -0,0 +1,95 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgbase=wxgtk +pkgname=(wxgtk2 wxgtk3 wxgtk-common) +pkgver=3.0.3.1 +pkgrel=6 +arch=('i686' 'x86_64') +url="https://wxwidgets.org" +license=('custom:wxWindows') +makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu' 'webkit2gtk' 'libnotify') +options=('!emptydirs') +source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2 + make-abicheck-non-fatal.patch wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch" + wxgtk2-fix-webview.patch::"https://github.com/wxWidgets/wxWidgets/commit/fd247cca.patch") +sha1sums=('ea785822d0f1c3290707bda6da570e596b3ec85a' + 'dfe38650c655395b90bf082b5734c4093508bfa3' + 'c9d013552b3078d7a9700df897333c2960207b0f' + '550c368a68eec8b6c32c61da289df76e4dd5a798') + +prepare() { + cd wxWidgets-${pkgver} + + # C++ ABI check is too strict and breaks with GCC 5.1 + # https://bugzilla.redhat.com/show_bug.cgi?id=1200611 + patch -Np1 -i ../make-abicheck-non-fatal.patch + + # Support webkit2gtk + sed -e 's|setup0.h|setup.h|g' -i ../wxgtk-webkit2gtk.patch + patch -p1 -i ../wxgtk-webkit2gtk.patch + # fix webview after webkit2gtk port + patch -p1 -i ../wxgtk2-fix-webview.patch + + cd .. + cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3 +} + +build() { + cd wxWidgets-${pkgver} + ./autogen.sh + ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ + --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ + --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ + --disable-precomp-headers + make + make -C locale allmo + + cd ../wxWidgets-${pkgver}-gtk3 + ./autogen.sh + ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=3 --with-opengl --enable-unicode \ + --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ + --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ + --disable-precomp-headers + make +} + +package_wxgtk-common() { + pkgdesc='Common libraries and headers for wxgtk2 and wxgtk3' + depends=('zlib' 'gcc-libs' 'expat') + + cd wxWidgets-${pkgver} + make DESTDIR="${pkgdir}" install + rm -r "$pkgdir"/usr/{bin/wx-config,lib/{wx,libwx_gtk*}} + + install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_wxgtk2() { + pkgdesc='GTK+2 implementation of wxWidgets API for GUI' + depends=('gtk2' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify') + optdepends=('webkitgtk2: for webview support') + conflicts=('wxgtk') + provides=('wxgtk') + replaces=('wxgtk') + + cd wxWidgets-${pkgver} + make DESTDIR="${pkgdir}" install + rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*} + + install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_wxgtk3() { + pkgdesc='GTK+3 implementation of wxWidgets API for GUI' + depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify') + optdepends=('webkit2gtk: for webview support') + conflicts=('wxgtk<3.0.3.1-2') + + cd wxWidgets-${pkgver}-gtk3 + make DESTDIR="${pkgdir}" install + rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*} + mv "$pkgdir"/usr/bin/wx-config{,-gtk3} + + install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: extra-i686/make-abicheck-non-fatal.patch =================================================================== --- extra-i686/make-abicheck-non-fatal.patch 2017-06-12 17:52:23 UTC (rev 298706) +++ extra-i686/make-abicheck-non-fatal.patch 2017-06-12 17:53:00 UTC (rev 298707) @@ -1,15 +0,0 @@ -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 - Copied: wxgtk/repos/extra-i686/make-abicheck-non-fatal.patch (from rev 298706, wxgtk/trunk/make-abicheck-non-fatal.patch) =================================================================== --- extra-i686/make-abicheck-non-fatal.patch (rev 0) +++ extra-i686/make-abicheck-non-fatal.patch 2017-06-12 17:53:00 UTC (rev 298707) @@ -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 + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2017-06-12 17:52:23 UTC (rev 298706) +++ extra-x86_64/PKGBUILD 2017-06-12 17:53:00 UTC (rev 298707) @@ -1,91 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgbase=wxgtk -pkgname=(wxgtk2 wxgtk3 wxgtk-common) -pkgver=3.0.3.1 -pkgrel=5 -arch=('i686' 'x86_64') -url="https://wxwidgets.org" -license=('custom:wxWindows') -makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu' 'webkit2gtk' 'libnotify') -options=('!emptydirs') -source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2 - make-abicheck-non-fatal.patch wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch") -sha1sums=('ea785822d0f1c3290707bda6da570e596b3ec85a' - 'dfe38650c655395b90bf082b5734c4093508bfa3' - 'c9d013552b3078d7a9700df897333c2960207b0f') - -prepare() { - cd wxWidgets-${pkgver} - - # C++ ABI check is too strict and breaks with GCC 5.1 - # https://bugzilla.redhat.com/show_bug.cgi?id=1200611 - patch -Np1 -i ../make-abicheck-non-fatal.patch - - # Support webkit2gtk - sed -e 's|setup0.h|setup.h|g' -i ../wxgtk-webkit2gtk.patch - patch -p1 -i ../wxgtk-webkit2gtk.patch - - cd .. - cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3 -} - -build() { - cd wxWidgets-${pkgver} - ./autogen.sh - ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ - --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ - --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ - --disable-precomp-headers - make - make -C locale allmo - - cd ../wxWidgets-${pkgver}-gtk3 - ./autogen.sh - ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=3 --with-opengl --enable-unicode \ - --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ - --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ - --disable-precomp-headers - make -} - -package_wxgtk-common() { - pkgdesc='Common libraries and headers for wxgtk2 and wxgtk3' - depends=('zlib' 'gcc-libs' 'expat') - - cd wxWidgets-${pkgver} - make DESTDIR="${pkgdir}" install - rm -r "$pkgdir"/usr/{bin/wx-config,lib/{wx,libwx_gtk*}} - - install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_wxgtk2() { - pkgdesc='GTK+2 implementation of wxWidgets API for GUI' - depends=('gtk2' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify') - optdepends=('webkitgtk2: for webview support') - conflicts=('wxgtk') - provides=('wxgtk') - replaces=('wxgtk') - - cd wxWidgets-${pkgver} - make DESTDIR="${pkgdir}" install - rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*} - - install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_wxgtk3() { - pkgdesc='GTK+3 implementation of wxWidgets API for GUI' - depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify') - optdepends=('webkit2gtk: for webview support') - conflicts=('wxgtk<3.0.3.1-2') - - cd wxWidgets-${pkgver}-gtk3 - make DESTDIR="${pkgdir}" install - rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*} - mv "$pkgdir"/usr/bin/wx-config{,-gtk3} - - install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: wxgtk/repos/extra-x86_64/PKGBUILD (from rev 298706, wxgtk/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-06-12 17:53:00 UTC (rev 298707) @@ -0,0 +1,95 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgbase=wxgtk +pkgname=(wxgtk2 wxgtk3 wxgtk-common) +pkgver=3.0.3.1 +pkgrel=6 +arch=('i686' 'x86_64') +url="https://wxwidgets.org" +license=('custom:wxWindows') +makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu' 'webkit2gtk' 'libnotify') +options=('!emptydirs') +source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2 + make-abicheck-non-fatal.patch wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch" + wxgtk2-fix-webview.patch::"https://github.com/wxWidgets/wxWidgets/commit/fd247cca.patch") +sha1sums=('ea785822d0f1c3290707bda6da570e596b3ec85a' + 'dfe38650c655395b90bf082b5734c4093508bfa3' + 'c9d013552b3078d7a9700df897333c2960207b0f' + '550c368a68eec8b6c32c61da289df76e4dd5a798') + +prepare() { + cd wxWidgets-${pkgver} + + # C++ ABI check is too strict and breaks with GCC 5.1 + # https://bugzilla.redhat.com/show_bug.cgi?id=1200611 + patch -Np1 -i ../make-abicheck-non-fatal.patch + + # Support webkit2gtk + sed -e 's|setup0.h|setup.h|g' -i ../wxgtk-webkit2gtk.patch + patch -p1 -i ../wxgtk-webkit2gtk.patch + # fix webview after webkit2gtk port + patch -p1 -i ../wxgtk2-fix-webview.patch + + cd .. + cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3 +} + +build() { + cd wxWidgets-${pkgver} + ./autogen.sh + ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ + --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ + --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ + --disable-precomp-headers + make + make -C locale allmo + + cd ../wxWidgets-${pkgver}-gtk3 + ./autogen.sh + ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=3 --with-opengl --enable-unicode \ + --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ + --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ + --disable-precomp-headers + make +} + +package_wxgtk-common() { + pkgdesc='Common libraries and headers for wxgtk2 and wxgtk3' + depends=('zlib' 'gcc-libs' 'expat') + + cd wxWidgets-${pkgver} + make DESTDIR="${pkgdir}" install + rm -r "$pkgdir"/usr/{bin/wx-config,lib/{wx,libwx_gtk*}} + + install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_wxgtk2() { + pkgdesc='GTK+2 implementation of wxWidgets API for GUI' + depends=('gtk2' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify') + optdepends=('webkitgtk2: for webview support') + conflicts=('wxgtk') + provides=('wxgtk') + replaces=('wxgtk') + + cd wxWidgets-${pkgver} + make DESTDIR="${pkgdir}" install + rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*} + + install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_wxgtk3() { + pkgdesc='GTK+3 implementation of wxWidgets API for GUI' + depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify') + optdepends=('webkit2gtk: for webview support') + conflicts=('wxgtk<3.0.3.1-2') + + cd wxWidgets-${pkgver}-gtk3 + make DESTDIR="${pkgdir}" install + rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*} + mv "$pkgdir"/usr/bin/wx-config{,-gtk3} + + install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: extra-x86_64/make-abicheck-non-fatal.patch =================================================================== --- extra-x86_64/make-abicheck-non-fatal.patch 2017-06-12 17:52:23 UTC (rev 298706) +++ extra-x86_64/make-abicheck-non-fatal.patch 2017-06-12 17:53:00 UTC (rev 298707) @@ -1,15 +0,0 @@ -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 - Copied: wxgtk/repos/extra-x86_64/make-abicheck-non-fatal.patch (from rev 298706, wxgtk/trunk/make-abicheck-non-fatal.patch) =================================================================== --- extra-x86_64/make-abicheck-non-fatal.patch (rev 0) +++ extra-x86_64/make-abicheck-non-fatal.patch 2017-06-12 17:53:00 UTC (rev 298707) @@ -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 +