rpms/openoffice.org/devel openoffice.org.spec, 1.1622, 1.1623 workspace.cmcfixes49.patch, 1.1, 1.2

Caolan McNamara caolanm at fedoraproject.org
Sat Aug 23 21:35:58 UTC 2008


Author: caolanm

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

Modified Files:
	openoffice.org.spec workspace.cmcfixes49.patch 
Log Message:
use renes fix up for m3


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1622
retrieving revision 1.1623
diff -u -r1.1622 -r1.1623
--- openoffice.org.spec	23 Aug 2008 19:03:28 -0000	1.1622
+++ openoffice.org.spec	23 Aug 2008 21:35:27 -0000	1.1623
@@ -1287,7 +1287,7 @@
 %patch37 -p1 -b .oooXXXXX.helpcontent2.fixlucene.patch
 %patch38 -p1 -b .ooo91904.sd.wrongindex.patch
 %patch39 -p1 -b .workspace.fpicker8.patch
-%patch40 -p1 -b .workspace.cmcfixes49.patch
+%patch40 -p0 -b .workspace.cmcfixes49.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.cmcfixes49.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 workspace.cmcfixes49.patch
Index: workspace.cmcfixes49.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes49.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.cmcfixes49.patch	20 Aug 2008 08:09:03 -0000	1.1
+++ workspace.cmcfixes49.patch	23 Aug 2008 21:35:28 -0000	1.2
@@ -1,10 +1,5 @@
-Index: configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.282
-diff -u -r1.282 configure.in
---- openoffice.org.orig/config_office/configure.in	31 Jul 2008 13:49:05 -0000	1.282
-+++ openoffice.org/config_office/configure.in	19 Aug 2008 13:33:04 -0000
+--- config_office/configure.in	31 Jul 2008 13:49:05 -0000	1.282
++++ config_office/configure.in	19 Aug 2008 13:33:04 -0000
 @@ -345,6 +345,9 @@
  AC_ARG_WITH(system-icu,
  [  --with-system-icu       Use icu already on system
@@ -30,7 +25,7 @@
 +  	test "$with_system_poppler" != "no"; then
 +      AC_MSG_RESULT([external])
 +      SYSTEM_POPPLER=YES
-+      PKG_CHECK_MODULES( POPPLER, poppler )
++      PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
 +  else
 +      AC_MSG_RESULT([internal])
 +      SYSTEM_POPPLER=NO
@@ -48,13 +43,8 @@
  
  AC_MSG_CHECKING([whether to build the MediaWiki Editor extension])
  if test -z "$enable_mediawiki" -a "$enable_mediawiki" != "no" && test "$WITH_JAVA" != "no"; then
-Index: set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.196
-diff -u -r1.196 set_soenv.in
---- openoffice.org.orig/config_office/set_soenv.in	31 Jul 2008 13:53:05 -0000	1.196
-+++ openoffice.org/config_office/set_soenv.in	19 Aug 2008 13:33:05 -0000
+--- config_office/set_soenv.in	31 Jul 2008 13:53:05 -0000	1.196
++++ config_office/set_soenv.in	19 Aug 2008 13:33:05 -0000
 @@ -1998,6 +1998,9 @@
  ToFile( "SYSTEM_FREETYPE",   "@SYSTEM_FREETYPE@",  "e" );
  ToFile( "FREETYPE_CFLAGS",   "@FREETYPE_CFLAGS@",  "e" );
@@ -65,37 +55,56 @@
  ToFile( "SYSTEM_CAIRO",      "@SYSTEM_CAIRO@",     "e" );
  ToFile( "CAIRO_CFLAGS",      "@CAIRO_CFLAGS@",     "e" );
  ToFile( "CAIRO_LIBS",        "@CAIRO_LIBS@",       "e" );
-Index: prj/build.lst
-===================================================================
-RCS file: /cvs/framework/filter/prj/build.lst,v
-retrieving revision 1.31
-diff -u -r1.31 build.lst
---- openoffice.org.orig/filter/prj/build.lst	24 Apr 2008 18:30:30 -0000	1.31
-+++ openoffice.org/filter/prj/build.lst	19 Aug 2008 15:13:19 -0000
-@@ -6,13 +6,15 @@
- fl	filter\source\xmlfilterdetect			nmake	-	all	fl_xmlfilterdetect	fl_inc NULL
- fl	filter\source\msfilter\powerpoint		nmake	-	all	fl_powerpoint		fl_inc NULL
- fl	filter\source\pdf						nmake	-	all	fl_pdf fl_svg		fl_inc NULL
-+fl  filter\source\pdfimport\xpdfwrapper     nmake   -   all fl_xpdfwrap			NULL
-+fl  filter\source\pdfimport\xpdftest        nmake   -   all fl_parsetest		fl_xpdfwrap NULL
- fl	filter\source\pdfimport\wrapper			nmake	-	all	fl_pdfwrap			fl_inc NULL
- fl	filter\source\pdfimport\misc			nmake	-	all	fl_misc				fl_inc NULL
- fl	filter\source\pdfimport\odf				nmake	-	all	fl_odf				fl_inc NULL
- fl	filter\source\pdfimport\pdfparse		nmake	-	all	fl_pdfparse			fl_inc NULL
- fl	filter\source\pdfimport\sax				nmake	-	all	fl_sax				fl_inc NULL
- fl	filter\source\pdfimport\tree			nmake	-	all	fl_tree				fl_inc NULL
--fl	filter\source\pdfimport					nmake	-	all	fl_pdfi fl_pdfwrap fl_misc fl_odf fl_pdfparse fl_sax fl_tree fl_inc NULL
-+fl	filter\source\pdfimport					nmake	-	all	fl_pdfi fl_pdfwrap fl_misc fl_odf fl_pdfparse fl_sax fl_tree fl_inc fl_xpdfwrap NULL
- fl	filter\source\svg						nmake	-	all	fl_svg				fl_inc NULL
- fl	filter\source\placeware					nmake	-	all	fl_placeware		fl_inc NULL
- fl	filter\source\flash						nmake	-	all	fl_flash fl_pdf			fl_inc NULL
-Index: source/pdfimport/makefile.mk
-===================================================================
-RCS file: /cvs/framework/filter/source/pdfimport/Attic/makefile.mk,v
-retrieving revision 1.12
-diff -u -r1.12 makefile.mk
---- openoffice.org.orig/filter/source/pdfimport/makefile.mk	7 Jul 2008 09:22:21 -0000	1.12
-+++ openoffice.org/filter/source/pdfimport/makefile.mk	19 Aug 2008 15:13:20 -0000
+--- xpdf/makefile.mk	11 Jul 2008 07:11:25 -0000	1.7
++++ xpdf/makefile.mk	19 Aug 2008 15:13:11 -0000
+@@ -42,6 +42,12 @@
+ 
+ .INCLUDE: settings.mk
+ 
++.IF "$(SYSTEM_POPPLER)" == "YES"
++dummy:
++        @echo "An already available installation of poppler should exist on your system."
++        @echo "Therefore xpdf provided here does not need to be built in addition."
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+ 
+ TARFILE_NAME=xpdf-3.02
+--- xpdf/prj/build.lst	6 Jun 2008 16:48:36 -0000	1.3
++++ xpdf/prj/build.lst	19 Aug 2008 15:13:11 -0000
+@@ -1,4 +1,2 @@
+ xp      xpdf : solenv sal soltools NULL
+ xp      xpdf						nmake   -       all     xp_xpdf NULL
+-xp		xpdf\wrapper			    nmake	-		all		xp_xpdfwrap xp_xpdf NULL
+-xp		xpdf\test				    nmake	-		all		xp_parsetest xp_xpdfwrap NULL
+--- xpdf/prj/d.lst	5 Dec 2007 14:16:41 -0000	1.1
++++ xpdf/prj/d.lst	19 Aug 2008 15:13:11 -0000
+@@ -1,3 +1,5 @@
+ mkdir: %_DEST%\inc%_EXT%\xpdf
+-..\%__SRC%\bin\xpdfimport.* %_DEST%\bin%_EXT%\xpdfimport.*
+-..\%__SRC%\bin\xpdfimport   %_DEST%\bin%_EXT%\xpdfimport
++..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\xpdf\*.h
++..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
++..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
++..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
+--- sdext/prj/build.lst	24 Apr 2008 18:30:30 -0000	1.31
++++ sdext/prj/build.lst	19 Aug 2008 15:13:19 -0000
+@@ -7,10 +7,12 @@
+ dx	sdext\source\minimizer\registry\data\org\openoffice\Office 		nmake	-	all sdext_minimizer_rdooo NULL
+ dx	sdext\source\presenter					nmake	-	all sdext_presenter NULL
+ dx	sdext\inc								nmake	-	all	sdext_inc				NULL
++dx  sdext\source\pdfimport\xpdfwrapper     nmake   -   all dx_xpdfwrap                        NULL
++dx  sdext\source\pdfimport\xpdftest        nmake   -   all dx_parsetest               dx_xpdfwrap NULL
+ dx	sdext\source\pdfimport\wrapper		nmake	-	all	sdext_pdfwrap	sdext_inc		NULL
+ dx	sdext\source\pdfimport\misc		nmake	-	all	sdext_misc	sdext_inc		NULL
+ dx	sdext\source\pdfimport\odf		nmake	-	all	sdext_odf	sdext_inc		NULL
+ dx	sdext\source\pdfimport\pdfparse		nmake	-	all	sdext_pdfparse	sdext_inc		NULL
+ dx	sdext\source\pdfimport\sax		nmake	-	all	sdext_sax	sdext_inc		NULL
+ dx	sdext\source\pdfimport\tree		nmake	-	all	sdext_tree	sdext_inc		NULL
+-dx	sdext\source\pdfimport			nmake	-	all	sdext_pdfi sdext_pdfwrap sdext_misc sdext_odf sdext_pdfparse sdext_sax sdext_tree sdext_inc NULL
++dx	sdext\source\pdfimport			nmake	-	all	sdext_pdfi sdext_pdfwrap sdext_misc sdext_odf sdext_pdfparse sdext_sax sdext_tree sdext_inc dx_xpdfwrap NULL
+--- sdext/source/pdfimport/makefile.mk	7 Jul 2008 09:22:21 -0000	1.12
++++ sdext/source/pdfimport/makefile.mk	19 Aug 2008 15:13:20 -0000
 @@ -107,7 +107,7 @@
      $(EXTENSIONDIR)$/pdf_types.xcu
  
@@ -114,12 +123,39944 @@
  	@@-$(MKDIRHIER) $(@:d)
      $(COPY) $< $@
  
-Index: source/pdfimport/xpdfwrapper/makefile.mk
-===================================================================
-RCS file: source/pdfimport/xpdfwrapper/makefile.mk
-diff -N source/pdfimport/xpdfwrapper/makefile.mk
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ openoffice.org/filter/source/pdfimport/xpdfwrapper/makefile.mk	19 Aug 2008 15:13:55 -0000
++++ sdext/source/pdfimport/xpdftest/makefile.mk	19 Aug 2008 15:13:32 -0000
+@@ -0,0 +1,58 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile$
++#
++# $Revision$
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..
++PRJNAME=filter
++TARGET=xpdftest
++TARGETTYPE=CUI
++ENABLE_EXCEPTIONS=TRUE
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE: settings.mk
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE :  target.mk
++
++#ALLTAR : $(MISC)$/test_0_succeeded $(MISC)$/test_1_succeeded
++
++$(MISC)$/test_0_succeeded: $(BIN)$/xpdfimport$(EXECPOST) binary_0_out.def text_0_out.def testinput.pdf
++	$(BIN)$/xpdfimport -f $(MISC)$/binary_0_out testinput.pdf > $(MISC)$/text_0_out
++	diff --strip-trailing-cr $(MISC)$/binary_0_out binary_0_out.def
++	diff --strip-trailing-cr $(MISC)$/text_0_out text_0_out.def
++	$(TOUCH) $@
++
++$(MISC)$/test_1_succeeded: $(BIN)$/xpdfimport$(EXECPOST) binary_1_out.def text_1_out.def book.pdf
[...39726 lines suppressed...]
++restoreState
++saveState
++updateFillColor 0.000000 0.000000 0.000000 1.000000
++updateFont 85 1 0 0 0 1200.000000 0 FAAAAA+Thorndale
++drawChar 129.900000 456.892000 132.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 132.900000 456.892000 135.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 135.900000 456.892000 138.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 138.900000 456.892000 141.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 141.900000 456.892000 144.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 144.900000 456.892000 147.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 147.900000 456.892000 150.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 150.900000 456.892000 153.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 153.900000 456.892000 156.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 156.900000 456.892000 159.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 159.900000 456.892000 162.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 162.900000 456.892000 165.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 165.900000 456.892000 168.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 168.900000 456.892000 171.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 171.900000 456.892000 174.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 174.900000 456.892000 177.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 177.900000 456.892000 180.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 180.900000 456.892000 183.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 183.900000 456.892000 186.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 186.900000 456.892000 189.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 189.900000 456.892000 192.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 192.900000 456.892000 195.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 195.900000 456.892000 198.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 198.900000 456.892000 201.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 201.900000 456.892000 204.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 204.900000 456.892000 207.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 207.900000 456.892000 210.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 210.900000 456.892000 213.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 213.900000 456.892000 216.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 216.900000 456.892000 219.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 219.900000 456.892000 222.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 222.900000 456.892000 225.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 225.900000 456.892000 228.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 228.900000 456.892000 231.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 231.900000 456.892000 234.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 234.900000 456.892000 237.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 237.900000 456.892000 240.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 240.900000 456.892000 243.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 243.900000 456.892000 246.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 246.900000 456.892000 249.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 249.900000 456.892000 252.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 252.900000 456.892000 255.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 255.900000 456.892000 258.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 258.900000 456.892000 261.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 261.900000 456.892000 264.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 264.900000 456.892000 267.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 267.900000 456.892000 270.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 270.900000 456.892000 273.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 273.900000 456.892000 276.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 276.900000 456.892000 279.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 279.900000 456.892000 282.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 282.900000 456.892000 285.900000 444.892000 1.000000 0.000000 0.000000 1.000000 .
++endTextObject
++restoreState
++saveState
++updateFillColor 0.000000 0.000000 0.000000 1.000000
++updateFont 85 1 0 0 0 1200.000000 0 FAAAAA+Thorndale
++drawChar 286.000000 456.892000 292.000000 444.892000 1.000000 0.000000 0.000000 1.000000 4
++endTextObject
++restoreState
++saveState
++updateFillColor 0.399994 0.399994 0.399994 1.000000
++updateFont 105 1 0 0 0 1200.000000 0 EAAAAA+Thorndale-Bold
++drawChar 76.700000 442.992000 84.692000 430.992000 1.000000 0.000000 0.000000 1.000000 Z
++endTextObject
++restoreState
++saveState
++updateFillColor 0.000000 0.000000 0.000000 1.000000
++updateFont 85 1 0 0 0 1200.000000 0 FAAAAA+Thorndale
++drawChar 76.700000 429.592000 84.020000 417.592000 1.000000 0.000000 0.000000 1.000000 Z
++drawChar 83.996000 429.592000 89.996000 417.592000 1.000000 0.000000 0.000000 1.000000 u
++drawChar 89.996000 429.592000 95.312000 417.592000 1.000000 0.000000 0.000000 1.000000 c
++drawChar 95.300000 429.592000 100.616000 417.592000 1.000000 0.000000 0.000000 1.000000 c
++drawChar 100.496000 429.592000 106.496000 417.592000 1.000000 0.000000 0.000000 1.000000 h
++drawChar 106.592000 429.592000 109.916000 417.592000 1.000000 0.000000 0.000000 1.000000 i
++drawChar 109.988000 429.592000 115.988000 417.592000 1.000000 0.000000 0.000000 1.000000 n
++drawChar 115.892000 429.592000 119.216000 417.592000 1.000000 0.000000 0.000000 1.000000 i
++endTextObject
++restoreState
++saveState
++updateFillColor 0.000000 0.000000 0.000000 1.000000
++updateFont 85 1 0 0 0 1200.000000 0 FAAAAA+Thorndale
++drawChar 119.200000 429.592000 122.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 122.200000 429.592000 125.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 125.200000 429.592000 128.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 128.200000 429.592000 131.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 131.200000 429.592000 134.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 134.200000 429.592000 137.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 137.200000 429.592000 140.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 140.200000 429.592000 143.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 143.200000 429.592000 146.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 146.200000 429.592000 149.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 149.200000 429.592000 152.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 152.200000 429.592000 155.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 155.200000 429.592000 158.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 158.200000 429.592000 161.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 161.200000 429.592000 164.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 164.200000 429.592000 167.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 167.200000 429.592000 170.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 170.200000 429.592000 173.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 173.200000 429.592000 176.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 176.200000 429.592000 179.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 179.200000 429.592000 182.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 182.200000 429.592000 185.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 185.200000 429.592000 188.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 188.200000 429.592000 191.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 191.200000 429.592000 194.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 194.200000 429.592000 197.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 197.200000 429.592000 200.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 200.200000 429.592000 203.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 203.200000 429.592000 206.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 206.200000 429.592000 209.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 209.200000 429.592000 212.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 212.200000 429.592000 215.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 215.200000 429.592000 218.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 218.200000 429.592000 221.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 221.200000 429.592000 224.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 224.200000 429.592000 227.200000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 227.296000 429.592000 230.296000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 230.392000 429.592000 233.392000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 233.488000 429.592000 236.488000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 236.584000 429.592000 239.584000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 239.680000 429.592000 242.680000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 242.776000 429.592000 245.776000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 245.872000 429.592000 248.872000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 248.968000 429.592000 251.968000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 252.064000 429.592000 255.064000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 255.160000 429.592000 258.160000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 258.256000 429.592000 261.256000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 261.352000 429.592000 264.352000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 264.448000 429.592000 267.448000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 267.544000 429.592000 270.544000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 270.640000 429.592000 273.640000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 273.736000 429.592000 276.736000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++drawChar 276.832000 429.592000 279.832000 417.592000 1.000000 0.000000 0.000000 1.000000 .
++endTextObject
++restoreState
++saveState
++updateFillColor 0.000000 0.000000 0.000000 1.000000
++updateFont 85 1 0 0 0 1200.000000 0 FAAAAA+Thorndale
++drawChar 280.000000 429.592000 286.000000 417.592000 1.000000 0.000000 0.000000 1.000000 1
++drawChar 286.000000 429.592000 292.000000 417.592000 1.000000 0.000000 0.000000 1.000000 1
++endTextObject
++restoreState
++updateFillColor 0.000000 0.000000 0.000000 1.000000
++eoFillPath subpath 1 306.000000 136.200000 0 306.100000 136.200000 0 306.100000 644.800000 0 306.000000 644.800000 0 306.000000 136.200000 0
++restoreState
++restoreState
++endPage
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ sdext/source/pdfimport/xpdfwrapper/makefile.mk	19 Aug 2008 15:13:55 -0000
 @@ -0,0 +1,76 @@
 +#*************************************************************************
 +#
@@ -197,12 +40138,8 @@
 +# --- Targets ------------------------------------------------------
 +
 +.INCLUDE :  target.mk
-Index: source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-===================================================================
-RCS file: source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-diff -N source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ openoffice.org/filter/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	19 Aug 2008 15:13:55 -0000
++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	19 Aug 2008 15:13:55 -0000
 @@ -0,0 +1,796 @@
 +/*************************************************************************
 + *
@@ -1000,12 +40937,8 @@
 +}
 +
 +}
-Index: source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-===================================================================
-RCS file: source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-diff -N source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ openoffice.org/filter/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx	19 Aug 2008 15:13:55 -0000
++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx	19 Aug 2008 15:13:55 -0000
 @@ -0,0 +1,290 @@
 +/*************************************************************************
 + *
@@ -1297,12 +41230,8 @@
 +
 +#endif /* INCLUDED_PDFI_OUTDEV_HXX */
 +
-Index: source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-===================================================================
-RCS file: source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-diff -N source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ openoffice.org/filter/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx	19 Aug 2008 15:13:55 -0000
++++ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx	19 Aug 2008 15:13:55 -0000
 @@ -0,0 +1,204 @@
 +/*************************************************************************
 + *




More information about the fedora-extras-commits mailing list