wxgtk: make ABI non fatal.

wxgtk/PKGBUILD

@@ -1,19 +1,26 @@
 pkgname=wxgtk
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('x86_64')
 url="http://wxwidgets.org"
 license=('custom:wxWindows')
 depends=('gtk2' 'gstreamer0.10-base')
-makedepends=('gstreamer0.10-base-plugins' 'glu')
+makedepends=('gstreamer0.10-base-plugins' 'glu' 'libwebkit-gtk2')
+optdepends=('libwebkitgtk2: for webview support')
 options=('!emptydirs')
-source=("http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2")
-sha256sums=('346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d')
+source=("http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2"
+        'make-abicheck-non-fatal.patch')
+sha256sums=('346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d'
+            '46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453') 
 
-# makedepends=('webkitgtk2')
-# optdepends=('webkitgtk2: for webview support')
-# --enable-webview
+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
+}
 
 build() {
   cd wxWidgets-${pkgver}
@@ -25,6 +32,7 @@ build() {
     --enable-unicode \
     --enable-graphics_ctx \
     --enable-mediactrl \
+    --enable-webview \
     --with-regex=builtin \
     --with-libpng=sys \
     --with-libxpm=sys \

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
+