rpms/openoffice.org/F-7 openoffice.org.ooo82608.vcl.gtkbadfree.patch, NONE, 1.1 openoffice.org.spec, 1.1198, 1.1199

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16740

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org.ooo82608.vcl.gtkbadfree.patch 
Log Message:
Resolves: rhbz#338701 fix openoffice.org.ooo82608.vcl.gtkbadfree.patch

openoffice.org.ooo82608.vcl.gtkbadfree.patch:

--- NEW FILE openoffice.org.ooo82608.vcl.gtkbadfree.patch ---
Index: unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.39
diff -u -r1.39 salnativewidgets-gtk.cxx
--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	3 Jul 2007 14:06:42 -0000	1.39
+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	19 Oct 2007 08:46:59 -0000
@@ -2898,9 +2899,9 @@
     aPartRect = Rectangle( aPartPos, aPartSize );
 
 	if ( pIndicatorSize )
-		g_free( pIndicatorSize );
+		gtk_requisition_free( pIndicatorSize );
 	if ( pIndicatorSpacing )
-		g_free( pIndicatorSpacing );
+		gtk_border_free( pIndicatorSpacing );
 
 	return( aPartRect );
 }
@@ -2947,9 +2948,9 @@
 		aIndicatorRect.Move( 0, 1 );
 
 	if ( pIndicatorSize )
-		g_free( pIndicatorSize );
+		gtk_requisition_free( pIndicatorSize );
 	if ( pIndicatorSpacing )
-		g_free( pIndicatorSpacing );
+		gtk_border_free( pIndicatorSpacing );
 
 	return( aIndicatorRect );
 }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org.spec,v
retrieving revision 1.1198
retrieving revision 1.1199
diff -u -r1.1198 -r1.1199
--- openoffice.org.spec	17 Oct 2007 11:44:32 -0000	1.1198
+++ openoffice.org.spec	19 Oct 2007 11:42:15 -0000	1.1199
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 6
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -132,6 +132,7 @@
 Patch65: openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
 Patch66: openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch
 Patch67: openoffice.org-2.3.0.ooo82458.libtextcat.rpath.patch
+Patch68: openoffice.org.ooo82608.vcl.gtkbadfree.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1062,6 +1063,7 @@
 %patch65 -p1 -b .ooo81323.svtools.sixtyfour.patch
 %patch66 -p1 -b .ooo81936.sc.maketypesagree.patch
 %patch67 -p1 -b .ooo82458.libtextcat.rpath.patch
+%patch68 -p1 -b .ooo82608.vcl.gtkbadfree.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2761,6 +2763,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Oct 19 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.4
+- Resolves: rhbz#338701 fix openoffice.org.ooo82608.vcl.gtkbadfree.patch
+
 * Tue Oct 16 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.3
 - Resolves: rhbz#335051 visibility semantics just aren't reliable and 
   its behaviour opaque and is effectively useless.