[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. 64c600f4c09c767fa429285fb29cdadd52b2763e
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 64c600f4c09c767fa429285fb29cdadd52b2763e
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jun 14 22:15:35 2011 +0000
add patches to fix connectivity build with system-hsqldb and to fix the smoketest...
diff --git a/patches/fix-connectivity-tests-with-system-hsqldb.diff b/patches/fix-connectivity-tests-with-system-hsqldb.diff
new file mode 100644
index 0000000..d04e3b2
--- /dev/null
+++ b/patches/fix-connectivity-tests-with-system-hsqldb.diff
@@ -0,0 +1,33 @@
+--- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old 2011-06-14 22:04:36.000000000 +0000
++++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-14 22:05:17.000000000 +0000
+@@ -358,6 +358,8 @@
+ # add missing #include <stdio.h> in autodoc, breaks when building with STLport5
+ #autodoc-add-missing-stdio-h.diff, rengelha
+
++fix-connectivity-tests-with-system-hsqldb.diff
++
+ [ DebianOnly ]
+ open-url-support-iceanimals.diff
+
+--- /dev/null 2011-06-02 14:58:12.448567841 +0000
++++ libreoffice-3.4.0/libreoffice-build/patches/dev300/fix-connectivity-tests-with-system-hsqldb.diff 2011-05-31 10:55:44.000000000 +0000
+@@ -0,0 +1,19 @@
++--- connectivity/qa/makefile.mk-old 2011-05-31 10:44:54.000000000 +0000
+++++ connectivity/qa/makefile.mk 2011-05-31 10:55:37.000000000 +0000
++@@ -35,9 +35,15 @@
++
++ #----- compile .java files -----------------------------------------
++
++-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar
+++JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
++ JAVAFILES := $(shell @$(FIND) complex -name "*.java")
++
+++.IF "$(SYSTEM_HSQLDB)" == "YES"
+++XCLASSPATH:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
+++.ELSE
+++JARFILES+= hsqldb.jar
+++.ENDIF
+++
++ #----- make a jar from compiled files ------------------------------
++
++ JARCLASSDIRS = $(PACKAGE)
diff --git a/patches/prevent-oosplash-smoketest-hangs.diff b/patches/prevent-oosplash-smoketest-hangs.diff
new file mode 100644
index 0000000..c4f3e11
--- /dev/null
+++ b/patches/prevent-oosplash-smoketest-hangs.diff
@@ -0,0 +1,34 @@
+--- /dev/null 2011-06-02 14:58:12.448567841 +0000
++++ libreoffice-3.4.0/libreoffice-build/patches/dev300/prevent-oosplash-smoketest-hangs.diff 2011-05-31 13:04:33.000000000 +0000
+@@ -0,0 +1,21 @@
++From c414bb1dc75b3db4fa88874ff5f978e6a0d18d56 Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++Date: Tue, 31 May 2011 12:58:48 +0000
++Subject: use --nologo to prevent oosplash smoketest hangs
++
++---
++diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx
++index 9bdddca..9225411 100644
++--- test/source/cpp/officeconnection.cxx
+++++ test/source/cpp/officeconnection.cxx
++@@ -76,7 +76,7 @@ void OfficeConnection::setUp() {
++ RTL_CONSTASCII_USTRINGPARAM("--nofirststartwizard"));
++ rtl::OUString norestoreArg(RTL_CONSTASCII_USTRINGPARAM("--norestore"));
++ //Disable use of the unix standalone splash screen app for the tests
++- rtl::OUString noSplashArg(RTL_CONSTASCII_USTRINGPARAM("--no-oosplash"));
+++ rtl::OUString noSplashArg(RTL_CONSTASCII_USTRINGPARAM("--nologo"));
++ rtl::OUString acceptArg(
++ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--accept=")) + desc +
++ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";urp")));
++--
++cgit v0.8.3-6-g21f6
+--- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old 2011-06-14 22:11:27.000000000 +0000
++++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-14 22:11:50.000000000 +0000
+@@ -359,6 +359,7 @@
+ #autodoc-add-missing-stdio-h.diff, rengelha
+
+ fix-connectivity-tests-with-system-hsqldb.diff
++prevent-oosplash-smoketest-hangs.diff
+
+ [ DebianOnly ]
+ open-url-support-iceanimals.diff
diff --git a/patches/series b/patches/series
index 4770f3a..7fcbf9f 100644
--- a/patches/series
+++ b/patches/series
@@ -4,6 +4,8 @@ no-minimaltoc.diff
update-debian-opt.diff
odk-jni-include.diff
disable-sdbc-postgresql.diff
+fix-connectivity-tests-with-system-hsqldb.diff
+prevent-oosplash-smoketest-hangs.diff
disable-ooinstall-in-package-ooo.diff
jurt-soffice-location.diff
packcomponents-remove-split-components.diff
--
LibreOffice packaging repository
Reply to: