GNOME.org
 

ooo-build r13638 - in trunk: . patches/dev300

Author: rengelhard
Date: Wed Aug 20 14:24:38 2008
New Revision: 13638
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13638&view=rev

Log:
2008-08-20  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/pdfimport-system-poppler-m29.diff,
          patches/dev300/pdfimport-system-poppler.diff: ooo300-m3


Added:
   trunk/patches/dev300/pdfimport-system-poppler-m29.diff   (props changed)
      - copied unchanged from r13637, /trunk/patches/dev300/pdfimport-system-poppler.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/pdfimport-system-poppler.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Aug 20 14:24:38 2008
@@ -2518,4 +2518,9 @@
 
 [ Fixes ]
 win32-mergemodule-pm.diff, tml
+
+[ Fixes < dev300-m30 < ooo300-m3 ]
+pdfimport-system-poppler-m3.diff, i#92920, cmc
+[ Fixes >= dev300-m30 >= ooo300-m3 ]
 pdfimport-system-poppler.diff, i#92920, cmc
+

Modified: trunk/patches/dev300/pdfimport-system-poppler.diff
==============================================================================
--- trunk/patches/dev300/pdfimport-system-poppler.diff	(original)
+++ trunk/patches/dev300/pdfimport-system-poppler.diff	Wed Aug 20 14:24:38 2008
@@ -87,27 +87,24 @@
 +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
 +..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
 +..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
---- filter/prj/build.lst	24 Apr 2008 18:30:30 -0000	1.31
-+++ 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
---- filter/source/pdfimport/makefile.mk	7 Jul 2008 09:22:21 -0000	1.12
-+++ filter/source/pdfimport/makefile.mk	19 Aug 2008 15:13:20 -0000
+--- 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_pdfwrap 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
  
@@ -127,7 +124,7 @@
      $(COPY) $< $@
  
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ filter/source/pdfimport/xpdftest/makefile.mk	19 Aug 2008 15:13:32 -0000
++++ sdext/source/pdfimport/xpdftest/makefile.mk	19 Aug 2008 15:13:32 -0000
 @@ -0,0 +1,58 @@
 +#*************************************************************************
 +#
@@ -188,7 +185,7 @@
 +	diff --strip-trailing-cr $(MISC)$/text_1_out text_1_out.def
 +	$(TOUCH) $@
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ filter/source/pdfimport/xpdftest/text_0_out.def	19 Aug 2008 15:13:33 -0000
++++ sdext/source/pdfimport/xpdftest/text_0_out.def	19 Aug 2008 15:13:33 -0000
 @@ -0,0 +1,202 @@
 +setPageNum 1
 +startPage 79400.000000 59500.000000
@@ -393,7 +390,7 @@
 +endPage
 +drawLink 34.700000 386.000000 166.700000 406.200000 http://download.openoffice.org/
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ filter/source/pdfimport/xpdftest/text_1_out.def	19 Aug 2008 15:13:55 -0000
++++ sdext/source/pdfimport/xpdftest/text_1_out.def	19 Aug 2008 15:13:55 -0000
 @@ -0,0 +1,39667 @@
 +setPageNum 18
 +startPage 61200.000000 79200.000000
@@ -40063,7 +40060,7 @@
 +restoreState
 +endPage
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ filter/source/pdfimport/xpdfwrapper/makefile.mk	19 Aug 2008 15:13:55 -0000
++++ sdext/source/pdfimport/xpdfwrapper/makefile.mk	19 Aug 2008 15:13:55 -0000
 @@ -0,0 +1,76 @@
 +#*************************************************************************
 +#
@@ -40142,7 +40139,7 @@
 +
 +.INCLUDE :  target.mk
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ 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 @@
 +/*************************************************************************
 + *
@@ -40941,7 +40938,7 @@
 +
 +}
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ 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 @@
 +/*************************************************************************
 + *
@@ -41234,7 +41231,7 @@
 +#endif /* INCLUDED_PDFI_OUTDEV_HXX */
 +
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ 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 @@
 +/*************************************************************************
 + *
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]