rpms/openoffice.org/F-8 openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch, NONE, 1.1 openoffice.org.spec, 1.1343, 1.1344

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch 
Log Message:
remove pixmap leak from F-8

openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch:

--- NEW FILE openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch ---
Index: source/gdi/salgdi2.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/salgdi2.cxx,v
retrieving revision 1.41
diff -u -r1.41 salgdi2.cxx
--- openoffice.org.org/vcl/source/gdi/salgdi2.cxx	3 Aug 2007 14:10:03 -0000	1.41
+++ openoffice.org/vcl/source/gdi/salgdi2.cxx	21 Jan 2008 10:33:05 -0000
@@ -939,6 +939,7 @@
 
     // TODO: used ScopedPic
     rPeer.FreePicture( aAlphaPic );
+    XFreePixmap(pXDisplay, aAlphaPM);
     rPeer.FreePicture( aSrcPic );
     rPeer.FreePicture( aDstPic );
     return true;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v
retrieving revision 1.1343
retrieving revision 1.1344
diff -u -r1.1343 -r1.1344
--- openoffice.org.spec	21 Jan 2008 11:57:39 -0000	1.1343
+++ openoffice.org.spec	21 Jan 2008 17:04:30 -0000	1.1344
@@ -164,6 +164,7 @@
 Patch82: openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch
 Patch83: workspace.sw8u9bf01.patch
 Patch84: workspace.sw24bf02.patch
+Patch85: openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1123,6 +1124,7 @@
 %patch82 -p1 -b .ooo83410.solenv.renameserbian.patch
 %patch83 -p1 -b .workspace.sw8u9bf01.patch
 %patch84 -p1 -b .workspace.sw24bf02.patch
+%patch85 -p1 -b .ooo85321.vcl.pixmapleak.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2832,6 +2834,7 @@
 * Fri Jan 18 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.12-UNRELEASED
 - Resolves: rhbz#429278 add workspace.sw8u9bf01.patch
 - Resolves: rhbz#428574 add workspace.sw24bf02.patch
+- remove pixmap leak openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch
 
 * Fri Jan 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.11
 - Resolves: rhbz#426876 add openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch