Don't abort on ABI check, backport from wxGTK

epel8
Mamoru TASAKA 10 years ago
parent 26939d076b
commit dd379207df

@ -0,0 +1,14 @@
--- wxWidgets-3.0.2/src/common/appbase.cpp.abicheck 2015-05-28 12:36:40.697163073 +0900
+++ wxWidgets-3.0.2/src/common/appbase.cpp 2015-05-28 12:38:30.597154298 +0900
@@ -762,10 +762,7 @@
msg.Printf(wxT("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());
}
return true;

@ -11,7 +11,7 @@
Name: %{wxgtkname}
Version: 3.0.2
Release: 5%{?dist}
Release: 6%{?dist}
Summary: GTK port of the wxWidgets GUI library
License: wxWidgets
Group: System Environment/Libraries
@ -19,7 +19,10 @@ URL: http://www.wxwidgets.org/
Source0: http://downloads.sf.net/wxwindows/%{srcname}-%{version}.tar.bz2
Source1: http://downloads.sf.net/wxwindows/%{srcname}-%{version}-docs-html.tar.bz2
Source10: wx-config
# https://bugzilla.redhat.com/show_bug.cgi?id=1225148
# remove abort when ABI check fails
# Backport from wxGTK
Patch0: wxGTK3-3.0.2-abicheck.patch
BuildRequires: gtk%{gtkver}-devel
#Note webkitgtk (GTK2) does not appear to be supported
%if %{gtkver} == 3
@ -121,6 +124,7 @@ This package provides documentation for the %{srcname} library.
%prep
%setup -q -n %{srcname}-%{version} -a 1
%patch0 -p1 -b .abicheck
# patch some installed files to avoid conflicts with 2.8.*
sed -i -e 's|aclocal)|aclocal/wxwin3.m4)|' Makefile.in
@ -243,6 +247,9 @@ popd
%doc html
%changelog
* Thu May 28 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.2-6
- Don't abort on ABI check, backport from wxGTK
* Mon May 04 2015 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.2-5
- Indicate that this package bundles scintilla 3.2.1.

Loading…
Cancel
Save