From 39885d38896e44b59cab5ec230cad1eab10ea709 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Mon, 22 Jun 2015 12:27:25 -0400 Subject: [PATCH] Add some upstream patches to fix warnings a crashes --- wxGTK3.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index 9469a39..978fd00 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -11,7 +11,7 @@ Name: %{wxgtkname} Version: 3.0.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -23,6 +23,10 @@ Source10: wx-config # remove abort when ABI check fails # Backport from wxGTK Patch0: wxGTK3-3.0.2-abicheck.patch +# This is a collection of fixes from upstream +# to fix warnings and crashes. See bug for details: +# https://bugzilla.redhat.com/show_bug.cgi?id=1234211 +Patch1: wxGTK3-3.0.2-upstreamfixes.patch BuildRequires: gtk%{gtkver}-devel #Note webkitgtk (GTK2) does not appear to be supported %if %{gtkver} == 3 @@ -125,6 +129,7 @@ This package provides documentation for the %{srcname} library. %prep %setup -q -n %{srcname}-%{version} -a 1 %patch0 -p1 -b .abicheck +%patch1 -p1 -b .upstreamfixes # patch some installed files to avoid conflicts with 2.8.* sed -i -e 's|aclocal)|aclocal/wxwin3.m4)|' Makefile.in @@ -247,6 +252,9 @@ popd %doc html %changelog +* Mon Jun 22 2015 Jeremy Newton - 3.0.2-8 +- Include some upstream patches to fix crashes and warnings + * Fri Jun 19 2015 Fedora Release Engineering - 3.0.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild