rpms/openoffice.org/devel ooo-build.ooo2497.filter.svg.patch, 1.3, 1.4

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25533

Modified Files:
	ooo-build.ooo2497.filter.svg.patch 
Log Message:
fix ooo-build.ooo2497.filter.svg.patch

ooo-build.ooo2497.filter.svg.patch:
 OOO310_m6/filter/source/config/fragments/fcfg_drawgraphics.mk                       |    1 
 OOO310_m6/filter/source/config/fragments/fcfg_internalgraphics.mk                   |    1 
 OOO310_m6/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu |   13 
 OOO310_m6/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu      |   10 
 OOO310_m6/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu     |    6 
 OOO310_m6/filter/source/svg/b2dellipse.cxx                                          |  139 
 OOO310_m6/filter/source/svg/b2dellipse.hxx                                          |   77 
 OOO310_m6/filter/source/svg/exports.map                                             |    5 
 OOO310_m6/filter/source/svg/gentoken.pl                                             |   58 
 OOO310_m6/filter/source/svg/gfxtypes.hxx                                            |  343 +
 OOO310_m6/filter/source/svg/makefile.mk                                             |   49 
 OOO310_m6/filter/source/svg/parserfragments.cxx                                     |  600 ++
 OOO310_m6/filter/source/svg/parserfragments.hxx                                     |   74 
 OOO310_m6/filter/source/svg/spirit_supplements.hxx                                  |  115 
 OOO310_m6/filter/source/svg/svgfilter.cxx                                           |  102 
 OOO310_m6/filter/source/svg/svgfilter.hxx                                           |   46 
 OOO310_m6/filter/source/svg/svgimport.cxx                                           |  197 
 OOO310_m6/filter/source/svg/svgreader.cxx                                           | 2772 ++++++++++
 OOO310_m6/filter/source/svg/svgreader.hxx                                           |   43 
 OOO310_m6/filter/source/svg/test/makefile.mk                                        |  115 
 OOO310_m6/filter/source/svg/test/odfserializer.cxx                                  |  140 
 OOO310_m6/filter/source/svg/test/odfserializer.hxx                                  |   31 
 OOO310_m6/filter/source/svg/test/parsertest.cxx                                     |  210 
 OOO310_m6/filter/source/svg/test/svg2odf.cxx                                        |  124 
 OOO310_m6/filter/source/svg/tokenmap.cxx                                            |   62 
 OOO310_m6/filter/source/svg/tokenmap.hxx                                            |   32 
 OOO310_m6/filter/source/svg/tokens.txt                                              |  403 +
 OOO310_m6/filter/source/svg/units.cxx                                               |   99 
 OOO310_m6/filter/source/svg/units.hxx                                               |   60 
 filter/source/svg/units.cxx                                                         |   27 
 30 files changed, 5697 insertions(+), 257 deletions(-)

Index: ooo-build.ooo2497.filter.svg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/ooo-build.ooo2497.filter.svg.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ooo-build.ooo2497.filter.svg.patch	10 Oct 2009 15:48:44 -0000	1.3
+++ ooo-build.ooo2497.filter.svg.patch	10 Oct 2009 22:44:58 -0000	1.4
@@ -806,23 +806,6 @@ diff -ruN OOO310_m6.orig/filter/source/s
 +$(SLO)$/parserfragments.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
 +
 +$(SLO)$/svgreader.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
-@@ -84,3 +92,16 @@
- # --- Targets ----------------------------------
- 
- .INCLUDE : target.mk
-+
-+# Generate gperf files - from oox/source/token
-+$(INCCOM)$/tokens.hxx $(MISC)$/tokens.gperf : tokens.txt gentoken.pl
-+		$(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(MISC)$/tokens.gperf
-+
-+$(INCCOM)$/tokens.cxx : $(MISC)$/tokens.gperf makefile.mk
-+		gperf --compare-strncmp -C -m 20 $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" >$(INCCOM)$/tokens.cxx
-+
-+$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
-+
-+$(SLO)$/parserfragments.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
-+
-+$(SLO)$/svgreader.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
 diff -ruN OOO310_m6.orig/filter/source/svg/parserfragments.cxx OOO310_m6/filter/source/svg/parserfragments.cxx
 --- OOO310_m6.orig/filter/source/svg/parserfragments.cxx	1970-01-01 01:00:00.000000000 +0100
 +++ OOO310_m6/filter/source/svg/parserfragments.cxx	2009-03-17 14:59:37.000000000 +0000