Compare commits

...

3 Commits

2 changed files with 58 additions and 10 deletions

View File

@ -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

View File

@ -9,7 +9,7 @@
Name: %{wxMain}
Version: 2.8.12
Release: 5mamba
Release: 9mamba
Summary: GTK+ port of the wxWidgets library
Group: System/Libraries
Vendor: openmamba
@ -19,6 +19,7 @@ URL: http://wxwindows.org/
Source: http://downloads.sourceforge.net/wxwindows/%{pkgname}-%{version}.tar.bz2
Patch0: %{name}-2.8.9-gvfs_syntax.patch
Patch1: wxGTK-2.8.12-locale-compat.patch
Patch2: wxGTK-2.8.12-make-abi-check-not-fatal.patch
License: LGPL
## AUTOBUILDREQ-BEGIN
BuildRequires: GConf-devel
@ -209,6 +210,14 @@ With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS
This package contains static libraries and header files need for development with the unicode enabled version of wxGTK.
%package -n %{wxMain}-presets
Summary: wxGTK presets
Group: System/Libraries
Provides: wxpresets
%description -n %{wxMain}-presets
wxGTK presets.
%package -n %{wxMain}-examples
Summary: wxGTK example programs
Group: Development/Libraries
@ -232,8 +241,10 @@ The translations files for the wxWidgets library.
%prep
%setup -q -n wxGTK-%{version} -a0
%patch1 -p1
%patch2 -p1
cd wxGTK-%{version}
%patch1 -p1
%patch2 -p1
cd ..
# FIXME: %{_datadir}/bakefile/presets generates a conflict between wx 2.6
@ -249,6 +260,7 @@ cd ..
--enable-shared \
--enable-soname \
--enable-tabdialog \
--enable-graphics_ctx \
--enable-mediactrl \
--with-libpng=sys \
--with-libjpeg=sys \
@ -263,7 +275,9 @@ cd ..
--with-gnomevfs \
--enable-optimise \
--without-debug_flag \
--without-debug_info
--without-debug_info \
CXXFLAGS="%{optflags} -Wno-narrowing"
# --disable-compat26 \
# --enable-accessibility
@ -281,6 +295,7 @@ cd wxGTK-%{version}
--enable-shared \
--enable-soname \
--enable-tabdialog \
--enable-graphics_ctx \
--enable-mediactrl \
--with-libpng=sys \
--with-libjpeg=sys \
@ -295,7 +310,9 @@ cd wxGTK-%{version}
--with-gnomevfs \
--enable-optimise \
--without-debug_flag \
--without-debug_info
--without-debug_info \
CXXFLAGS="%{optflags} -Wno-narrowing"
# --disable-compat26 \
# --enable-accessibility
@ -319,15 +336,15 @@ ln -sf %{_libdir}/wx/config/gtk2-ansi-release-%{majversion} \
install -d %{buildroot}%{_datadir}/wx/examples/src
cp -a demos samples %{buildroot}%{_datadir}/wx/examples
# FIXME: wxwin.m4 generate a conflict between wx 2.6 and 2.8
#mv %{buildroot}%{_datadir}/aclocal/wxwin.m4 \
# %{buildroot}%{_datadir}/aclocal/wxwin%{majversion}.m4
# unicode version
cd wxGTK-%{version}
%makeinstall
%makeinstall -C contrib/src
# NOTE: wxwin.m4 generates a conflict between wx 2.8 and 3.0
mv %{buildroot}%{_datadir}/aclocal/wxwin.m4 \
%{buildroot}%{_datadir}/aclocal/wxwin%{majversion}.m4
mv %{buildroot}%{_bindir}/wxrc-%{majversion} \
%{buildroot}%{_bindir}/wxrc-%{majversion}-unicode
@ -430,9 +447,7 @@ fi
%defattr(-,root,root)
%{_libdir}/wx/%{majversion}/sound_sdl-%{majversion}.so
%{_includedir}/wx-%{majversion}/
# note: these files generate conflicts between wx 2.6 and 2.8
%{_datadir}/aclocal/wxwin.m4
%{_datadir}/bakefile/
%{_datadir}/aclocal/wxwin%{majversion}.m4
%files -n %{wxGTK_name}
%defattr(-,root,root)
@ -457,7 +472,25 @@ fi
%defattr(-,root,root)
%{_datadir}/wx/examples
%files -n %{wxMain}-presets
%defattr(-,root,root)
%dir %{_datadir}/bakefile
%dir %{_datadir}/bakefile/presets
%{_datadir}/bakefile/presets/*
%changelog
* Sat Jul 30 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 2.8.12-9mamba
- rebuilt with --enable-graphics_ctx
* Tue Feb 02 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 2.8.12-8mamba
- move presets to a -presets package to avoid confict with wxWidgets 3
* Sun Jan 31 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 2.8.12-7mamba
- rebuilt with gcc 5.3.0
* Fri Aug 22 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.8.12-6mamba
- rename /usr/share/aclocal/wxwin.m4 to avoid a conflict with 3.0
* Mon Mar 24 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.8.12-5mamba
- also remove conflicting wxmsw.mo (don't know how to rename but should be useful on windows only)