rpms/openoffice.org/devel openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch, 1.1, 1.2 openoffice.org.spec, 1.1347, 1.1348 openoffice.org-2.3.1.83876.unopkg.avoida11y.patch, 1.1, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch 
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.3.1.83876.unopkg.avoida11y.patch 
Log Message:
more magic required to get past gcc

openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch:

Index: openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch	27 Nov 2007 08:57:54 -0000	1.1
+++ openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch	27 Nov 2007 11:26:27 -0000	1.2
@@ -517,3 +517,47 @@
              /* This class implements the following grammar (more or
                 less literally written down below, only slightly
                 obfuscated by the parser actions):
+Index: source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx,v
+retrieving revision 1.10.414.1
+diff -u -r1.10.414.1 EnhancedCustomShapeFunctionParser.cxx
+--- openoffice.org.orig/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx	26 Oct 2007 15:09:44 -0000	1.10.414.1
++++ openoffice.org/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx	27 Nov 2007 11:23:45 -0000
+@@ -801,7 +801,7 @@
+         mpContext->maOperandStack.push( ExpressionNodeSharedPtr( new ConstantValueExpression( mnValue ) ) );
+     }
+ };
+-
++}
+ /** Generate parse-dependent-but-then-constant value
+     */
+ class DoubleConstantFunctor
+@@ -929,6 +929,8 @@
+     }
+ };
+ 
++namespace
++{
+ class IfFunctor
+ {
+     ParserContextSharedPtr	mpContext;
+@@ -963,7 +965,7 @@
+             rNodeStack.push( pNode );										// push complex node, that calcs the value on demand
+     }
+ };
+-
++}
+ // Workaround for MSVC compiler anomaly (stack trashing)
+ //
+ // The default ureal_parser_policies implementation of parse_exp 
+@@ -986,7 +988,8 @@
+         return ::boost::spirit::ch_p('E').parse(scan); 
+     }
+ };
+-
++namespace
++{
+ /* This class implements the following grammar (more or
+     less literally written down below, only slightly
+     obfuscated by the parser actions):


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1347
retrieving revision 1.1348
diff -u -r1.1347 -r1.1348
--- openoffice.org.spec	27 Nov 2007 08:57:54 -0000	1.1347
+++ openoffice.org.spec	27 Nov 2007 11:26:27 -0000	1.1348
@@ -153,11 +153,10 @@
 Patch70: openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch
 Patch71: openoffice.org-2.3.1.ooo82911.sd.insertbackground.patch
 Patch72: workspace.sw8u10bf02.patch
-Patch73: openoffice.org-2.3.1.83876.unopkg.avoida11y.patch
-Patch74: openoffice.org-2.3.1.ooo83877.sal.allowsoftlinkdelete.patch
-Patch75: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch76: openoffice.org-2.3.1.ooo83930.sw.flushanchors.patch
-Patch77: openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch
+Patch73: openoffice.org-2.3.1.ooo83877.sal.allowsoftlinkdelete.patch
+Patch74: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch75: openoffice.org-2.3.1.ooo83930.sw.flushanchors.patch
+Patch76: openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1109,11 +1108,10 @@
 %patch70 -p1 -b .ooo83591.vcl.checkboxes.patch
 %patch71 -p1 -b .ooo82911.sd.insertbackground.patch
 %patch72 -p1 -b .workspace.sw8u10bf02.patch
-%patch73 -p1 -b .ooo83876.unopkg.avoida11y.patch
-%patch74 -p1 -b .ooo83877.sal.allowsoftlinkdelete.patch
-%patch75 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch76 -p1 -b .ooo83930.sw.flushanchors.patch
-%patch77 -p1 -b .ooo84001.slideshow.gccisaprick.patch
+%patch73 -p1 -b .ooo83877.sal.allowsoftlinkdelete.patch
+%patch74 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch75 -p1 -b .ooo83930.sw.flushanchors.patch
+%patch76 -p1 -b .ooo84001.slideshow.gccisaprick.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2815,6 +2813,7 @@
 - Resolves: rhbz#384391 add openoffice.org-2.3.1.ooo83930.sw.flushanchors.patch
 - split out libhyphen and hyphenators
 - add openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch coz gcc hates us
+- drop openoffice.org-2.3.1.83876.unopkg.avoida11y.patch coz upstream won't do it
 
 * Thu Nov 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.3
 - Resolves: rhbz#247634 add openoffice.org-2.3.1.ooo82911.sd.insertbackground.patch (jnavrati)


--- openoffice.org-2.3.1.83876.unopkg.avoida11y.patch DELETED ---