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

[szalaik svn gnome org]

Author: szalaik
Date: Wed Sep 17 06:38:16 2008
New Revision: 13904
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13904&view=rev

Log:
2008-09-17  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/extensions_configure.diff
	* patches/dev300/pdfimport-system-poppler.diff:
	Moved scp2 variable of PDF Import from extensions_configure.diff 
to
	pdfimport-system-poppler.diff. This avoid build breakage of 
OOOP.

	* patches/dev300/scp2_accessories.diff: Fix packaging conflict




Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/extensions_configure.diff
   branches/ooo-build-3-0/patches/dev300/pdfimport-system-poppler.diff
   branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff

Modified: branches/ooo-build-3-0/patches/dev300/extensions_configure.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/extensions_configure.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/extensions_configure.diff	Wed Sep 17 06:38:16 2008
@@ -16,14 +16,6 @@
  fi
  AC_SUBST(ENABLE_PRESENTER_SCREEN)
  
-@@ -5432,6 +5434,7 @@
- else
-   AC_MSG_RESULT([no])
-   ENABLE_PDFIMPORT=NO
-+   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PDFIMPORT"
- fi
- AC_SUBST(ENABLE_PDFIMPORT)
- 
 @@ -5472,6 +5475,7 @@
  else
    AC_MSG_RESULT([no])

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	Wed Sep 17 06:38:16 2008
@@ -10,7 +10,7 @@
  AC_ARG_WITH(system-db,
  [  --with-system-db        Use berkeley db already on system
  ],,)
-@@ -5387,20 +5387,33 @@ AC_SUBST(ENABLE_PRESENTER_SCREEN)
+@@ -5387,20 +5387,34 @@ AC_SUBST(ENABLE_PRESENTER_SCREEN)
  
  AC_MSG_CHECKING([whether to build the PDF Import extension])
  if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
@@ -45,6 +45,7 @@
 -  ENABLE_PDFIMPORT=NO
 +   AC_MSG_RESULT([no])
 +   ENABLE_PDFIMPORT=NO
++   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PDFIMPORT"
  fi
  AC_SUBST(ENABLE_PDFIMPORT)
 +AC_SUBST(SYSTEM_POPPLER)

Modified: branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff	Wed Sep 17 06:38:16 2008
@@ -1,7 +1,7 @@
 diff -Naur scp2/source/accessories/file_accessories.scp scp2/source/accessories/file_accessories.scp
 --- scp2/source/accessories/file_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/file_accessories.scp	2008-03-22 10:57:33.000000000 +0100
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,55 @@
 +/*************************************************************************
 +*
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -56,6 +56,7 @@
 +    ARCHIVE_TXT_FILE_BODY_PATCH;
 +    Name = "basicsrvooowikipedia.zip";
 +End
++
 diff -Naur scp2/source/accessories/file_font_accessories.scp scp2/source/accessories/file_font_accessories.scp
 --- scp2/source/accessories/file_font_accessories.scp.orig	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/file_font_accessories.scp	2008-04-05 09:24:30.000000000 +0200