rpms/openoffice.org/devel openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch, NONE, 1.1 openoffice.org.spec, 1.1477, 1.1478

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8109

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch 
Log Message:
add openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch

openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch:

--- NEW FILE openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch ---
Index: source/cairo/cairo_canvashelper.hxx
===================================================================
RCS file: /cvs/gsl/canvas/source/cairo/cairo_canvashelper.hxx,v
retrieving revision 1.5
diff -u -r1.5 cairo_canvashelper.hxx
--- openoffice.org.orig/canvas/source/cairo/cairo_canvashelper.hxx	9 Nov 2007 10:14:00 -0000	1.5
+++ openoffice.org/canvas/source/cairo/cairo_canvashelper.hxx	14 Apr 2008 13:27:28 -0000
@@ -331,7 +331,8 @@
 					Operation aOperation,
 					::cairo::Cairo* pCairo,
 					const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >* pTextures=NULL,
-					SpriteCanvas* pDevice=NULL );
+					SpriteCanvas* pDevice=NULL, 
+					::com::sun::star::rendering::FillRule eFillrule=::com::sun::star::rendering::FillRule_EVEN_ODD);
     void doOperation( Operation aOperation,
 		      ::cairo::Cairo* pCairo,
 		      sal_uInt32 nPolygonIndex=0,


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1477
retrieving revision 1.1478
diff -u -r1.1477 -r1.1478
--- openoffice.org.spec	14 Apr 2008 10:28:01 -0000	1.1477
+++ openoffice.org.spec	14 Apr 2008 13:31:43 -0000	1.1478
@@ -139,6 +139,7 @@
 Patch66: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
 Patch67: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
 Patch68: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
+Patch69: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1247,6 +1248,7 @@
 %patch66 -p1 -b .ooo87604.fixupsystemhunspell.patch
 %patch67 -p1 -b .ooo85691.vcl.tooltipcolor.patch
 %patch68 -p1 -b .ooo87991.fpickersafe.patch
+%patch69 -p1 -b .ooo88260.decl-defi-mismatch.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3281,6 +3283,7 @@
 - next version
 - drop integrated openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
 - extend selinux bodge to s390x
+- add openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
 
 * Wed Apr 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.4
 - Resolves: rhbz#441128 openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch