[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_dfsg-4-69-g5f7149f
The following commit has been merged in the debian-experimental-3.5 branch:
commit 5f7149f6f3a675a78ba41e98f695b9366cfed1a4
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 19 15:15:08 2013 +0100
fix internal hsqldb build after lib/servlet.jar removal...
diff --git a/changelog b/changelog
index 17b855e..e91e5c6 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,8 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
* src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: remove
lib/servlet.jar..
+ * debian/patches/fix-internal-hsqldb-build.diff: ... and fix internal
+ hsqldb build to use /usr/share/java/servlet-api-2.5.jar
* debian/patches/poppler_0_2*.diff: fix build of sdext with poppler
0.21.x and fix the test with 0.20.x, thanks Pino Toscano
diff --git a/patches/fix-internal-hsqldb-build.diff b/patches/fix-internal-hsqldb-build.diff
new file mode 100644
index 0000000..4f7be6e
--- /dev/null
+++ b/patches/fix-internal-hsqldb-build.diff
@@ -0,0 +1,46 @@
+diff -urN hsqldb.old/makefile.mk hsqldb/makefile.mk
+--- a/hsqldb/makefile.mk 2012-10-03 14:05:01.000000000 +0200
++++ b/hsqldb/makefile.mk 2013-03-19 15:10:12.857800613 +0100
+@@ -59,7 +59,8 @@
+ patches$/i97032.patch \
+ patches$/i103528.patch \
+ patches$/i104901.patch \
+- patches$/fdo36824.patch
++ patches$/fdo36824.patch \
++ patches$/use-system-servlet-api.jar.diff
+
+ .IF "$(JAVANUMVER:s/.//)" >= "000100060000"
+ PATCH_FILES+= \
+diff -urN hsqldb.old/patches/use-system-servlet-api.jar.diff hsqldb/patches/use-system-servlet-api.jar.diff
+--- a/hsqldb/patches/use-system-servlet-api.jar.diff 1970-01-01 01:00:00.000000000 +0100
++++ b/hsqldb/patches/use-system-servlet-api.jar.diff 2013-03-19 15:09:42.137801521 +0100
+@@ -0,0 +1,29 @@
++--- misc/hsqldb/build/build.xml
+++++ misc/build/hsqldb/build/build.xml
++@@ -356,7 +356,7 @@
++ optimize="${build.optimize}"
++ >
++ <classpath>
++- <pathelement location="lib/servlet.jar"/>
+++ <pathelement location="/usr/share/java/servlet-api-2.5.jar"/>
++ </classpath>
++ <include name="*.java"/>
++ <include name="org/hsqldb/*.java"/>
++@@ -818,7 +818,7 @@
++ ${src}/org/hsqldb/util/RCData.java,
++ ${src}/org/hsqldb/util/SqlTool.java"
++ destdir="${basedir}/doc/src"
++- classpath="${basedir}/lib/servlet.jar;${basedir}/lib/junit.jar"
+++ classpath="/usr/share/java/servlet-api-2.5.jar;${basedir}/lib/junit.jar"
++ author="true"
++ version="false"
++ use="true"
++@@ -839,7 +839,7 @@
++ <javadoc packagenames="org.hsqldb.*,org.hsqldb.jdbc.*,org.hsqldb.lib.*,org.hsqldb.util.*"
++ sourcepath="${src}"
++ destdir="${basedir}/doc/src"
++- classpath="${basedir}/lib/servlet.jar;${basedir}/lib/junit.jar"
+++ classpath="/usr/share/java/servlet-api-2.5.jar;${basedir}/lib/junit.jar"
++ author="true"
++ version="false"
++ use="true"
diff --git a/patches/series b/patches/series
index d35a857..44ecbc3 100644
--- a/patches/series
+++ b/patches/series
@@ -41,3 +41,4 @@ poppler_0_20_x.diff
poppler_0_21_x.diff
fix-view-option.diff
odk-link-to-jdk-1.5-docs.diff
+fix-internal-hsqldb-build.diff
diff --git a/rules b/rules
index 9844c9e..d1897e5 100755
--- a/rules
+++ b/rules
@@ -1048,6 +1048,7 @@ ifeq "$(ENABLE_JAVA)" "y"
BASE_HSQLDB_DEPENDS = libhsqldb-java $(HSQLDB_MINVER), libhsqldb-java (<< $(HSQLDB_TOONEWVER)~)
JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj [$(OOO_GCJ_ARCHS)]
else
+ BUILD_DEPS += , libservlet2.5-java
ifneq "$(JDK)" "openjdk"
# hsqldb with jdk7 buildfix from jdk7.diff fails with gcj
$(error hsqldb with jdk7 buildfix from jdk7.diff fails with gcj)
--
LibreOffice packaging repository
Reply to: