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

[Maxime Gauduin]

    Date: Saturday, May 23, 2015 @ 14:06:35
  Author: alucryd
Revision: 134001

upgpkg: lib32-wxgtk 3.0.2-5

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

-------------------------------+
 PKGBUILD                      |    5 ++++-
 make-abicheck-non-fatal.patch |   16 ++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-23 12:02:04 UTC (rev 134000)
+++ PKGBUILD	2015-05-23 12:06:35 UTC (rev 134001)
@@ -4,7 +4,7 @@
 
 pkgname=lib32-wxgtk
 pkgver=3.0.2
-pkgrel=4
+pkgrel=5
 pkgdesc='GTK+ implementation of wxWidgets API for GUI'
 arch=('x86_64')
 url='http://wxwidgets.org'
@@ -13,13 +13,16 @@
 makedepends=('gcc-multilib' 'lib32-glu')
 options=('!emptydirs')
 source=("http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2"
+        'make-abicheck-non-fatal.patch'
         'wxGTK-collision.patch')
 sha256sums=('346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d'
+            'd4c2d070a06eb63f0a018c8cf687589e5ffdec601225b4d16a268ffe390fb58b'
             'c73c51f4b65a779462a4e0923a7e3bc7fe28457258fc8bfb5d843d87df119364')
 
 prepare() {
   cd wx*-${pkgver}
 
+  patch -Np1 -i ../make-abicheck-non-fatal.patch
   patch -Np1 -i ../wxGTK-collision.patch
 }
 

Added: make-abicheck-non-fatal.patch
===================================================================
--- make-abicheck-non-fatal.patch	                        (rev 0)
+++ make-abicheck-non-fatal.patch	2015-05-23 12:06:35 UTC (rev 134001)
@@ -0,0 +1,16 @@
+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
+ 
+