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

[Evangelos Foutras]

    Date: Friday, April 24, 2015 @ 22:38:39
  Author: foutrelis
Revision: 238024

upgpkg: wxgtk2.8 2.8.12.1-3

Make C++ ABI check non-fatal.

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-24 20:32:21 UTC (rev 238023)
+++ PKGBUILD	2015-04-24 20:38:39 UTC (rev 238024)
@@ -3,7 +3,7 @@
 
 pkgname=wxgtk2.8
 pkgver=2.8.12.1
-pkgrel=2
+pkgrel=3
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
 url="http://wxwidgets.org"
@@ -11,13 +11,20 @@
 depends=('gtk2' 'gstreamer0.10-base' 'sdl')
 makedepends=('gstreamer0.10-base-plugins' 'gconf' 'glu')
 options=('!emptydirs')
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 wxGTK-collision.patch)
+source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
+        wxGTK-collision.patch
+        make-abicheck-non-fatal.patch)
 sha1sums=('05688dc03d61631750f5904273122bb40a2115f5'
-          '75d2292a0058570aa6071b4bee6eef69e47f1208')
+          '75d2292a0058570aa6071b4bee6eef69e47f1208'
+          'dfe38650c655395b90bf082b5734c4093508bfa3')
 
 prepare() {
   cd wx*-${pkgver}
   patch -p1 -i ../wxGTK-collision.patch
+
+  # 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() {

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