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

[hmth svn gnome org]

Author: hmth
Date: Sat Sep 27 14:26:55 2008
New Revision: 14121
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14121&view=rev

Log:
2008-09-27  Hanno Meyer-Thurow  <h mth web de>

	* patches/dev300/system-xmlsec.diff: fix apply.
	* patches/dev300/kde4-configure.diff: add Qt4 include and library
	directories for Gentoo.
	* patches/dev300/buildfix_no-pdfimport.diff: do not try to build
	pdfimport extension if disabled, i#88375.
	* patches/dev300/buildfix_helpcontent2_system-lucene-analyzers.diff:
	helpcontent2 needs lucene-analyzers.jar with system lucene, i#93294.
	* patches/dev300/apply: add buildfix_* patches to BuildBits.


Added:
   branches/ooo-build-3-0/patches/dev300/buildfix_helpcontent2_system-lucene-analyzers.diff
   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/kde4-configure.diff
   branches/ooo-build-3-0/patches/dev300/system-xmlsec.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	Sat Sep 27 14:26:55 2008
@@ -102,7 +102,7 @@
 openmamba: LinuxCommon, GlobalDesktopFiles
 #Gentoo
 GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CairoFonts, BerkeleyDB43, Gcc43
-GentooUnstable: GentooBase, GentooExperimental
+GentooUnstable: GentooBase, GentooExperimental, IntegrateExtensions, KDE4
 Gentoo : GentooBase
 Gentoo64: GentooBase
 # rPath Linux
@@ -1001,6 +1001,11 @@
 novell-win32-agfa-monotype-fonts.diff, tml
 
 [ BuildBits ]
+# no pdfimport extension
+buildfix_no-pdfimport.diff, i#88375, hmth
+# helpcotent2 misses system lucene analysis classes
+buildfix_helpcontent2_system-lucene-analyzers.diff, i#93294, hmth
+
 # allow to define java target, so the build is usable with the JVM 1.5
 # even when it is built with JDK 1.6
 build-java-target.diff, i#93115, pmladek

Added: branches/ooo-build-3-0/patches/dev300/buildfix_helpcontent2_system-lucene-analyzers.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/buildfix_helpcontent2_system-lucene-analyzers.diff	Sat Sep 27 14:26:55 2008
@@ -0,0 +1,11 @@
+--- helpcontent2/settings.pmk.orig	2008-09-27 03:31:28.000000000 +0200
++++ helpcontent2/settings.pmk	2008-09-27 03:31:45.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$
+ .IF "$(SYSTEM_LUCENE)" == "YES"
+-my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)
++my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
+ .ELSE
+ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar
+ .ENDIF

Added: branches/ooo-build-3-0/patches/dev300/buildfix_no-pdfimport.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/buildfix_no-pdfimport.diff	Sat Sep 27 14:26:55 2008
@@ -0,0 +1,28 @@
+--- sdext/source/pdfimport/xpdftest/makefile.mk.orig	2008-09-27 15:55:08.000000000 +0200
++++ sdext/source/pdfimport/xpdftest/makefile.mk	2008-09-27 15:55:43.000000000 +0200
+@@ -39,6 +39,11 @@
+ 
+ .INCLUDE: settings.mk
+ 
++.IF "$(ENABLE_PDFIMPORT)" == "NO"
++ all:
++	@echo "PDF Import extension disabled."
++.ENDIF
++
+ # --- Targets ------------------------------------------------------
+ 
+ .INCLUDE :  target.mk
+--- sdext/source/pdfimport/xpdfwrapper/makefile.mk.orig	2008-09-27 15:55:00.000000000 +0200
++++ sdext/source/pdfimport/xpdfwrapper/makefile.mk	2008-09-27 15:56:03.000000000 +0200
+@@ -47,6 +47,11 @@
+ CFLAGS += -I$(SOLARINCDIR)$/xpdf
+ .ENDIF
+ 
++.IF "$(ENABLE_PDFIMPORT)" == "NO"
++ all:
++	@echo "PDF Import extension disabled."
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+ UWINAPILIB:=
+ APP1TARGET=$(TARGET)

Modified: branches/ooo-build-3-0/patches/dev300/kde4-configure.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/kde4-configure.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/kde4-configure.diff	Sat Sep 27 14:26:55 2008
@@ -6,13 +6,13 @@
      if test "$build_cpu" != "x86_64" ; then
 -        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include $x_includes"
 -        qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries"
-+        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt4/include /usr/lib/qt/include /usr/share/qt4/include $x_includes"
-+        qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt4/lib /usr/lib/qt/lib /usr/share/qt4/lib $x_libraries"
++        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt4/include /usr/lib/qt/include /usr/share/qt4/include $x_includes"
++        qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt4 /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt4/lib /usr/lib/qt/lib /usr/share/qt4/lib $x_libraries"
      else
 -        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include $x_includes"
 -        qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries"
-+        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt4/include /usr/lib64/qt/include /usr/share/qt4/include /usr/lib/qt4/include /usr/lib/qt/include $x_includes"
-+        qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt4/lib64 /usr/lib64/qt/lib64 /usr/share/qt4/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt4/lib /usr/lib/qt/lib /usr/share/qt4/lib $x_libraries"
++        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt4/include /usr/lib64/qt/include /usr/share/qt4/include /usr/lib/qt4/include /usr/lib/qt/include $x_includes"
++        qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt4 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt4/lib64 /usr/lib64/qt/lib64 /usr/share/qt4/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt4/lib /usr/lib/qt/lib /usr/share/qt4/lib $x_libraries"
      fi
      if test -n "$QTDIR" ; then
          qt_incdirs="$QTDIR/include $qt_incdirs"

Modified: branches/ooo-build-3-0/patches/dev300/system-xmlsec.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/system-xmlsec.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/system-xmlsec.diff	Sat Sep 27 14:26:55 2008
@@ -18,7 +18,7 @@
 @@ -3571,11 +3574,10 @@ if test -n "$with_system_libxml" -o -n "
      AC_MSG_RESULT([external])
      SYSTEM_LIBXML=YES
-     PKG_CHECK_MODULES( LIBXML, libxml-2.0 >= 2.0 )
+     PKG_CHECK_MODULES_MACHACK(LIBXML, xml2-config, libxml-2.0 >= 2.0)
 -    BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
  else
      AC_MSG_RESULT([internal])