[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-137-g1e23764
The following commit has been merged in the debian-experimental-3.5 branch:
commit 1e45ad0798e887abb91b6f4becc32f0a99f7826f
Author: Rene Engelhard <rene@debian.org>
Date: Wed Dec 14 09:03:24 2011 +0100
update rhino-build-optional.diff to apply!
diff --git a/patches/rhino-build-optional.diff b/patches/rhino-build-optional.diff
index 2f24d74..b406bf1 100644
--- a/patches/rhino-build-optional.diff
+++ b/patches/rhino-build-optional.diff
@@ -3,7 +3,7 @@ index 6037452..2251d85 100644
--- libreoffice-3.5.0/configure.in
+++ libreoffice-3.5.0/configure.in
@@ -7507,6 +7508,7 @@ AC_MSG_CHECKING([whether to build extension for support of scripts in JavaScript
- if test "x$enable_ext_scripting_javascript" = "xyes" -a "x$enable_extension_integration" != "xno"; then
+ if test "x$enable_ext_scripting_javascript" = "xyes" -a "x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then
AC_MSG_RESULT([yes])
ENABLE_SCRIPTING_JAVASCRIPT=YES
+ BUILD_TYPE="$BUILD_TYPE RHINO"
--
LibreOffice packaging repository
Reply to: