From fe0231c82bb726d8ced2f31badae0b2433477781 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 25 Jan 2016 21:34:11 +0000
Subject: wxgtk: update to 3.0.2-5

---
 abs/extra/wxgtk/PKGBUILD                      | 16 +++++++++++++---
 abs/extra/wxgtk/make-abicheck-non-fatal.patch | 15 +++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 abs/extra/wxgtk/make-abicheck-non-fatal.patch

diff --git a/abs/extra/wxgtk/PKGBUILD b/abs/extra/wxgtk/PKGBUILD
index da0cdab..c0944fb 100644
--- a/abs/extra/wxgtk/PKGBUILD
+++ b/abs/extra/wxgtk/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=wxgtk
 pkgver=3.0.2
-pkgrel=2
+pkgrel=5
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
 url="http://wxwidgets.org"
@@ -12,8 +12,18 @@ depends=('gtk2' 'gstreamer0.10-base' 'libsm')
 makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu')
 optdepends=('webkitgtk2: for webview support')
 options=('!emptydirs')
-source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2)
-sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800')
+source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2
+        make-abicheck-non-fatal.patch)
+sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800'
+          'dfe38650c655395b90bf082b5734c4093508bfa3')
+
+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}
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
+ 
-- 
cgit v0.12

