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

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu May  1 13:16:21 2008
New Revision: 12414
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12414&view=rev

Log:
2008-05-01  Rene Engelhard  <rene debian org>

        * patches/dev300/apply
          patches/dev300/buildfix-disable-pdfimport.diff: fix
          --disable-pdfimport build


Added:
   trunk/patches/dev300/buildfix-disable-pdfimport.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu May  1 13:16:21 2008
@@ -903,6 +903,7 @@
 
 [ BuildBits < dev300-m11 ]
 buildfix-xmlhelp-system-expat.diff, i#86979
+buildfix-disable-pdfimport.diff, i#88375
 
 [ BuildBits ]
 # fix the --enable-reportdesign configure check to work

Added: trunk/patches/dev300/buildfix-disable-pdfimport.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/buildfix-disable-pdfimport.diff	Thu May  1 13:16:21 2008
@@ -0,0 +1,40 @@
+Index: source/pdfimport/test/makefile.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/pdfimport/test/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- filter/source/pdfimport/test/makefile.mk	11 Apr 2008 10:51:44 -0000	1.5
++++ filter/source/pdfimport/test/makefile.mk	17 Apr 2008 07:53:23 -0000
+@@ -41,6 +41,11 @@
+ 
+ # --- test lib ------------------------------------------------------
+ 
++.IF "$(ENABLE_PDFIMPORT)" == "NO"
++ all:
++        @echo "PDF Import extension disabled."
++.ENDIF
++
+ .IF "$(SYSTEM_ZLIB)" == "YES"
+ CFLAGS+=-DSYSTEM_ZLIB
+ .ENDIF
+Index: source/pdfimport/test/testdocs/makefile.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/pdfimport/test/testdocs/makefile.mk,v
+retrieving revision 1.3
+diff -u -r1.3 makefile.mk
+--- filter/source/pdfimport/test/testdocs/makefile.mk	11 Apr 2008 10:53:50 -0000	1.3
++++ filter/source/pdfimport/test/testdocs/makefile.mk	17 Apr 2008 07:53:23 -0000
+@@ -46,6 +46,7 @@
+ 	verticaltext.pdf
+ 
+ # --- Fake uno bootstrap ------------------------
++.IF "$(ENABLE_PDFIMPORT)" != "NO"
+ 
+ $(BIN)$/pdfi_unittest_test.ini : makefile.mk
+ 	rm -f $@
+@@ -80,3 +81,5 @@
+ $(foreach,i,$(TESTFILES:s/.pdf/_pdfi_unittest_writer_succeeded/:f) $(MISC)$/$i)  : $(BIN)$/pdfi_unittest_test.ini $(BIN)$/pdf2xml$(EXECPOST)
+ $(foreach,i,$(TESTFILES:s/.pdf/_pdfi_unittest_impress_succeeded/:f) $(MISC)$/$i) : $(BIN)$/pdfi_unittest_test.ini $(BIN)$/pdf2xml$(EXECPOST)
+ $(foreach,i,$(TESTFILES:s/.pdf/_pdfi_unittest_draw_succeeded/:f) $(MISC)$/$i)    : $(BIN)$/pdfi_unittest_test.ini $(BIN)$/pdf2xml$(EXECPOST)
++
++.ENDIF