[arch-commits] Commit in wxgtk/trunk (PKGBUILD make-abicheck-non-fatal.patch)

[Evangelos Foutras]

    Date: Friday, April 24, 2015 @ 22:32:09
  Author: foutrelis
Revision: 238022

upgpkg: wxgtk 3.0.2-4

Make C++ ABI check non-fatal.

Added:
  wxgtk/trunk/make-abicheck-non-fatal.patch
Modified:
  wxgtk/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   16 +++++++++++++---
 make-abicheck-non-fatal.patch |   15 +++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-24 20:11:08 UTC (rev 238021)
+++ PKGBUILD	2015-04-24 20:32:09 UTC (rev 238022)
@@ -3,7 +3,7 @@
 
 pkgname=wxgtk
 pkgver=3.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
 url="http://wxwidgets.org"
@@ -12,9 +12,19 @@
 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}
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \

Added: make-abicheck-non-fatal.patch
===================================================================
--- make-abicheck-non-fatal.patch	                        (rev 0)
+++ make-abicheck-non-fatal.patch	2015-04-24 20:32:09 UTC (rev 238022)
@@ -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
+