ooo-build r14129 - in branches/ooo-build-3-0: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Sun Sep 28 11:34:10 2008
New Revision: 14129
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14129&view=rev

Log:
2008-09-28  Rene Engelhard  <rene debian org>

        * patches/dev300/buildfix-no-pdfimport.diff: remove completely ..
        * patches/dev300/pdfimport-system-poppler.diff: ... and merge here



Removed:
   branches/ooo-build-3-0/patches/dev300/buildfix-no-pdfimport.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply
   branches/ooo-build-3-0/patches/dev300/pdfimport-system-poppler.diff

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Sun Sep 28 11:34:10 2008
@@ -2674,10 +2674,6 @@
 pdfimport-system-poppler.diff, i#92920, cmc
 pdfimport-lax-restrictions.diff, i#90468, thorsten
 
-[ BuildBits ]
-# no pdfimport extension
-buildfix-no-pdfimport.diff, i#88375, hmth
-
 [ NovellOnlyWin32 ]
 i92372.diff, i#92372, n#353143, tml
 

Modified: branches/ooo-build-3-0/patches/dev300/pdfimport-system-poppler.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/pdfimport-system-poppler.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/pdfimport-system-poppler.diff	Sun Sep 28 11:34:10 2008
@@ -136,7 +136,7 @@
  
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ sdext/source/pdfimport/xpdftest/makefile.mk	19 Aug 2008 15:13:32 -0000
-@@ -0,0 +1,58 @@
+@@ -0,0 +1,63 @@
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -178,6 +178,11 @@
 +
 +.INCLUDE: settings.mk
 +
++.IF "$(ENABLE_PDFIMPORT)" == "NO"
++ all:
++       @echo "PDF Import extension disabled."
++.ENDIF
++
 +# --- Targets ------------------------------------------------------
 +
 +.INCLUDE :  target.mk
@@ -40072,7 +40077,7 @@
 +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 @@
+@@ -0,0 +1,81 @@
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40122,6 +40127,11 @@
 +CFLAGS += -I$(SOLARINCDIR)$/xpdf
 +.ENDIF
 +
++.IF "$(ENABLE_PDFIMPORT)" == "NO"
++ all:
++       @echo "PDF Import extension disabled."
++.ENDIF
++
 +# --- Files --------------------------------------------------------
 +UWINAPILIB:=
 +APP1TARGET=$(TARGET)