rpms/compat-wxGTK26/devel wxGTK-2.6.3-gtk-crash.patch, NONE, 1.1 compat-wxGTK26.spec, 1.1, 1.2

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/compat-wxGTK26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32131

Modified Files:
	compat-wxGTK26.spec 
Added Files:
	wxGTK-2.6.3-gtk-crash.patch 
Log Message:
* Sun Jul  8 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-3
- Avoid g_free related crashes in gtk.


wxGTK-2.6.3-gtk-crash.patch:

--- NEW FILE wxGTK-2.6.3-gtk-crash.patch ---
diff -Nur wxGTK-2.6.3-orig/src/gtk/button.cpp wxGTK-2.6.3/src/gtk/button.cpp
--- wxGTK-2.6.3-orig/src/gtk/button.cpp	2006-03-22 00:42:16.000000000 +0100
+++ wxGTK-2.6.3/src/gtk/button.cpp	2007-07-08 01:03:24.000000000 +0200
@@ -89,7 +89,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 );
         }
 #else
         left_border = 6;
diff -Nur wxGTK-2.6.3-orig/src/gtk/window.cpp wxGTK-2.6.3/src/gtk/window.cpp
--- wxGTK-2.6.3-orig/src/gtk/window.cpp	2006-03-22 00:42:17.000000000 +0100
+++ wxGTK-2.6.3/src/gtk/window.cpp	2007-07-08 01:03:13.000000000 +0200
@@ -3279,7 +3279,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 );
             }
 #else
             left_border = 6;


Index: compat-wxGTK26.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/compat-wxGTK26.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-wxGTK26.spec	23 Feb 2007 14:34:31 -0000	1.1
+++ compat-wxGTK26.spec	8 Jul 2007 10:30:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           compat-wxGTK26
 Version:        2.6.3
-Release:        2
+Release:        3
 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
@@ -11,6 +11,7 @@
 Source0:        http://dl.sf.net/wxwindows/wxGTK-%{version}.tar.bz2
 Patch0:         wxGTK-2.6.3.2-cvs.patch
 Patch1:         wxGTK-2.6.3-locale-compat.patch
+Patch2:         wxGTK-2.6.3-gtk-crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
@@ -46,6 +47,7 @@
 
 %patch0 -p1 -b .2.6.3.2
 %patch1 -p1 -b .locale-compat
+%patch2 -p1 -b .gtk-crash
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -152,6 +154,9 @@
 
 
 %changelog
+* Sun Jul  8 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-3
+- Avoid g_free related crashes in gtk.
+
 * Tue Feb 20 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-2
 - Avoid executable source files in debuginfo package.
 - Make wx-2.6-config symlink relative.