[ooo-build-commit] patches/dev300

[René Engelhard]

 patches/dev300/apply                       |    4 ++++
 patches/dev300/buildfix-system-lucene.diff |   25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

New commits:
commit 28d1dbc487f893cb144678e19ba22c9cf2ad85e1
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Sep 29 02:51:57 2009 +0200

    fix build with system-lucene
    
    * patches/dev300/apply:
    * patches/dev300/buildfix-system-lucene.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 78870f8..40565cc 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1155,6 +1155,10 @@ armeabi-softfp-buildfix.diff, i#105302, doko
 # support db4.8
 db4.8.diff, rengelha
 
+[ BuildBits >= dev300-m60 ]
+# fix build with system-lucene
+buildfix-system-lucene.diff, i105433, rengelha
+
 [ BuildBits < dev300-m60 ]
 # add ro
 postset-add-ro.diff
diff --git a/patches/dev300/buildfix-system-lucene.diff b/patches/dev300/buildfix-system-lucene.diff
new file mode 100644
index 0000000..d21f260
--- /dev/null
+++ b/patches/dev300/buildfix-system-lucene.diff
@@ -0,0 +1,25 @@
+--- transex3/prj/build.lst-old	2009-09-29 00:42:03.000000000 +0200
++++ transex3/prj/build.lst	2009-09-29 00:40:57.000000000 +0200
+@@ -1,4 +1,4 @@
+-tr	transex3	:	tools libxslt berkeleydb lucene NULL
++tr	transex3	:	tools libxslt berkeleydb LUCENE:lucene NULL
+ tr	transex3						usr1	-	all	tr_mkout NULL
+ tr	transex3\inc					nmake	-	all	tr_inc NULL
+ tr	transex3\source					nmake	-	all	tr_src tr_inc NULL
+--- transex3/source/help/makefile.mk-old	2009-09-29 01:34:53.000000000 +0200
++++ transex3/source/help/makefile.mk	2009-09-29 01:31:23.000000000 +0200
+@@ -112,7 +112,7 @@
+ 
+ #JARFILES  = ridl.jar jurt.jar unoil.jar juh.jar
+ .IF "$(SYSTEM_LUCENE)" == "YES"
+-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
++CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
+ COMP=fix_system_lucene
+ .ELSE
+ JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar
+@@ -136,4 +136,4 @@
+ fix_system_lucene:
+     @echo "Fix Java Class-Path entry for Lucene libraries from system."
+     @$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
+-    -i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF
++    -i ../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF