[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-4-65-g852bf9e
The following commit has been merged in the debian-experimental-3.5 branch:
commit 852bf9e7dc7448019e1c509c45721acc70887c51
Author: Rene Engelhard <rene@debian.org>
Date: Thu Nov 3 21:43:00 2011 +0100
temporary workaround for mozilla breakage; --disable-mozilla
diff --git a/rules b/rules
index 98521f0..34dcb1c 100755
--- a/rules
+++ b/rules
@@ -210,6 +210,7 @@ USE_SYSTEM_DMAKE=y
USE_LIBSUITESPARSE=y
SUITESPARSE_MIN_VERSION= (>= 1:3.4.0)
PARALLEL_BUILD=n
+ENABLE_MOZILLA=n
MOZILLA=libxul
ENABLE_LDAP=y
USE_OPENLDAP=y
@@ -845,10 +846,10 @@ ifneq (,$(filter nss, $(SYSTEM_STUFF)))
BUILD_DEPS+= , libnss3-dev (>= 3.12.3)
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg
endif
-ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_MOZILLA_ARCHS)))
+#ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_MOZILLA_ARCHS)))
CONFIGURE_FLAGS += --disable-mozilla
PACKAGE_NPSOPLUGIN=n
-endif
+#endif
ifeq "$(USE_SYSTEM_DMAKE)" "y"
BUILD_DEPS += , dmake (>= 1:4.11)
--
LibreOffice packaging repository
Reply to: