From a4fbc0d1ea954f220497b1fed5b8357cc741a1da Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Jul 17 2007 02:25:16 +0000 Subject: - patch from svn to fix rh bug #247414 --- diff --git a/wxGTK-2.8.4-bad-g_free.patch b/wxGTK-2.8.4-bad-g_free.patch new file mode 100644 index 0000000..fbc0836 --- /dev/null +++ b/wxGTK-2.8.4-bad-g_free.patch @@ -0,0 +1,22 @@ +--- wxWidgets/trunk/src/gtk/button.cpp 2007/04/23 15:16:06 45602 ++++ wxWidgets/trunk/src/gtk/button.cpp 2007/06/18 06:03:50 46513 +@@ -71,7 +71,7 @@ + right_border += default_border->right; + top_border += default_border->top; + bottom_border += default_border->bottom; +- g_free( default_border ); ++ gtk_border_free( default_border ); + } + win->MoveWindow( + win->m_x - top_border, +--- wxWidgets/trunk/src/gtk/window.cpp 2007/05/30 13:55:09 46249 ++++ wxWidgets/trunk/src/gtk/window.cpp 2007/06/18 06:03:50 46513 +@@ -2738,7 +2738,7 @@ + right_border += default_border->right; + top_border += default_border->top; + bottom_border += default_border->bottom; +- g_free( default_border ); ++ gtk_border_free( default_border ); + } + } + diff --git a/wxGTK.spec b/wxGTK.spec index d2627aa..8c85421 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -6,7 +6,7 @@ Name: wxGTK Version: 2.8.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GTK2 port of the wxWidgets GUI library # The wxWindows licence is the LGPL with a specific exemption allowing # distribution of derived binaries under any terms. (This will eventually @@ -15,6 +15,9 @@ License: wxWidgets Library Licence Group: System Environment/Libraries URL: http://www.wxwidgets.org/ Source0: http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2 +# http://svn.wxwidgets.org/viewvc/wx?view=rev&revision=46513 +Patch0: wxGTK-2.8.4-bad-g_free.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, zlib-devel >= 1.1.4 @@ -95,6 +98,7 @@ ODBC (a SQL database connectivity API) add-on for the wxWidgets library. %prep %setup -q +%patch0 -p2 -b .badfree sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure @@ -223,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jul 16 2007 Matthew Miller - 2.8.4-4 +- patch from svn to fix rh bug #247414 + * Thu Jul 12 2007 Matthew Miller - 2.8.4-3 - include libwx_gtk2u_media, since I'm now listing the buildreqs properly.