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

[hmth svn gnome org]

Author: hmth
Date: Sun Sep 28 17:37:25 2008
New Revision: 14130
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14130&view=rev

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

	* patches/dev300/extensions_configure.diff:
	* patches/dev300/scp2_extensions.diff: fix defines for templates and
	install error.
	* patches/dev300/gentoo-system-lucene.diff: add ...
	* patches/dev300/apply: ... to GentooOnly section.


Added:
   branches/ooo-build-3-0/patches/dev300/gentoo-system-lucene.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply
   branches/ooo-build-3-0/patches/dev300/extensions_configure.diff
   branches/ooo-build-3-0/patches/dev300/scp2_extensions.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 17:37:25 2008
@@ -1417,6 +1417,8 @@
 [ GentooOnly ]
 SectionOwner => aprosky
 
+# system lucene classpath
+gentoo-system-lucene.diff
 # Allow build to proceed with PaX enabled
 gentoo-pax-fix.diff, aprosky
 # support server-only versions of 64bit JDKs

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	Sun Sep 28 17:37:25 2008
@@ -65,7 +65,7 @@
  dnl ===================================================================
 +dnl Test whether to integrate extensions into the product's installer
 +dnl ===================================================================
-+AC_MSG_CHECKING([for Sun Professinal Template Pack intergration (only supported languages displayed)])
++AC_MSG_CHECKING([for Sun Extension intergration])
 +if test "z$with_extension_integration" = "z" -o "z$ith_extension_integration" = "zno" ; then
 +  WITH_EXTENSION_INTEGRATION=NO
 +  AC_MSG_RESULT([no integration])
@@ -102,7 +102,7 @@
 +	if test -n "`echo $with_lang | grep "$lang"`" ; then
 +		SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
 +		fixed_lang=`echo $lang | sed -e s/-/_/g`
-+       SCPDEFS="$SCPDEFS -DWITH_WITH_EXTENSION_SUN_TEMPLATE_PACK_$fixed_lang"
++       SCPDEFS="$SCPDEFS -DWITH_EXTENSION_SUN_TEMPLATE_PACK_$fixed_lang"
 +	fi
 +    done
 +    AC_MSG_RESULT([$SUNTEMPLATES_LANG])

Added: branches/ooo-build-3-0/patches/dev300/gentoo-system-lucene.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/gentoo-system-lucene.diff	Sun Sep 28 17:37:25 2008
@@ -0,0 +1,6 @@
+--- xmlhelp/source/com/sun/star/help/MANIFEST.MF	24 Jun 2008 16:19:03 -0000	1.2
++++ xmlhelp/source/com/sun/star/help/MANIFEST.MF	27 Jun 2008 21:05:05 -0000
+@@ -1,2 +1,2 @@
+ RegistrationClassName: com.sun.star.help.HelpSearch
+-Class-Path: lucene-core-2.3.jar lucene-analyzers-2.3.jar
++Class-Path: file:///usr/share/lucene-2.3/lib/lucene-core.jar file:///usr/share/lucene-analyzers-2.3/lib/lucene-analyzers.jar

Modified: branches/ooo-build-3-0/patches/dev300/scp2_extensions.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/scp2_extensions.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/scp2_extensions.diff	Sun Sep 28 17:37:25 2008
@@ -108,7 +108,7 @@
 +
 +/* ** Sun Template Pack (en-US) ** */
 +
-+#ifndef WITHOUT_EXTENSION_SUN_TEMPLATE_PACK_en_US
++#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_en_US
 +
 +File gid_File_Optional_Extensions_Sun_Template_Pack_en-US
 +    TXT_FILE_BODY;
@@ -121,7 +121,7 @@
 +
 +/* ** Sun Template Pack (de) ** */
 +
-+#ifndef WITHOUT_EXTENSION_SUN_TEMPLATE_PACK_de
++#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_de
 +
 +File gid_File_Optional_Extensions_Sun_Template_Pack_de
 +    TXT_FILE_BODY;
@@ -134,7 +134,7 @@
 +
 +/* ** Sun Template Pack (it) ** */
 +
-+#ifndef WITHOUT_EXTENSION_SUN_TEMPLATE_PACK_it
++#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_it
 +
 +File gid_File_Optional_Extensions_Sun_Template_Pack_it
 +    TXT_FILE_BODY;
@@ -147,7 +147,7 @@
 +
 +/* ** Sun Template Pack (fr) ** */
 +
-+#ifndef WITHOUT_EXTENSION_SUN_TEMPLATE_PACK_fr
++#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_fr
 +
 +File gid_File_Optional_Extensions_Sun_Template_Pack_fr
 +    TXT_FILE_BODY;
@@ -160,7 +160,7 @@
 +
 +/* ** Sun Template Pack (es) ** */
 +
-+#ifndef WITHOUT_EXTENSION_SUN_TEMPLATE_PACK_es
++#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_es
 +
 +File gid_File_Optional_Extensions_Sun_Template_Pack_es
 +    TXT_FILE_BODY;