[libreoffice] 02/03: stop passing --disable-report-builder to build-archs configure (and the same for the script framework stuff for consistency). s/REPORTDESIGN/REPORTBUILDER/
Rene Engelhard
rene at moszumanska.debian.org
Thu Dec 14 22:22:39 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 1cc43da27cba24e1c1dd22e5d77dd6af18577873
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Thu Dec 14 23:22:29 2017 +0100
stop passing --disable-report-builder to build-archs configure (and the same for the script framework stuff for consistency). s/REPORTDESIGN/REPORTBUILDER/
---
changelog | 5 +++++
control.in | 4 ++--
rules | 50 +++++++++++++++++++++++++-------------------------
3 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/changelog b/changelog
index 3097ea9..0a77f58 100644
--- a/changelog
+++ b/changelog
@@ -25,6 +25,11 @@ libreoffice (1:5.4.4~rc2-1) UNRELEASED; urgency=medium
- change BRAND_BASE_DIR in fundamentalrc so that we don't get
/usr/lib/libreoffice/program/../program/xpdfimport calls. We know
the path and the apparmor profile doesn't allow this
+ - stop passing --disable-report-builder to build-archs configure since
+ even though it's built the report builder doesn't work then. Move
+ from Build-Depends-Indep: to Build-Depends: again (closes: #875688);
+ * debian/rules, debian/control.in:
+ s/REPORTDESIGN/REPORTBUILDER/ while we're at it
* debian/control.in: add gnupg to Suggests
* debian/copyright:
- mention sysui/desktop/apparmor/* copyright/license
diff --git a/control.in b/control.in
index 70e22ea..b5237a0 100644
--- a/control.in
+++ b/control.in
@@ -27,7 +27,7 @@ Depends: libreoffice-base%OOO_NO_BASE_ARCHS%,
libreoffice-draw,
libreoffice-impress,
libreoffice-math,
- libreoffice-report-builder-bin%OOO_NO_REPORTDESIGN_ARCHS%,
+ libreoffice-report-builder-bin%OOO_NO_REPORTBUILDER_ARCHS%,
libreoffice-writer,
${avmedia-be-depends},
${misc:Depends},
@@ -45,7 +45,7 @@ Recommends: ${java-common-depends},
libreoffice-ogltrans,
libreoffice-librelogo,
libreoffice-nlpsolver,
- libreoffice-report-builder%OOO_NO_REPORTDESIGN_ARCHS%,
+ libreoffice-report-builder%OOO_NO_REPORTBUILDER_ARCHS%,
libreoffice-wiki-publisher,
libreoffice-sdbc-postgresql
Suggests: cups-bsd,
diff --git a/rules b/rules
index 02ce862..0626688 100755
--- a/rules
+++ b/rules
@@ -380,7 +380,7 @@ ENABLE_GLTF=y
SYSTEM_STUFF += libgltf
LIBGLTF_MINVER=0.1.0
ifeq "$(ENABLE_JAVA)" "y"
- ENABLE_REPORTDESIGN=y
+ ENABLE_REPORTBUILDER=y
SYSTEM_STUFF += jfreereport
ENABLE_MEDIAWIKI=y
SYSTEM_STUFF += apache-commons
@@ -388,7 +388,7 @@ ifeq "$(ENABLE_JAVA)" "y"
ENABLE_SCRIPT_PROVIDER_JS=y
ENABLE_NLPSOLVER=y
else
- ENABLE_REPORTDESIGN=n
+ ENABLE_REPORTBUILDER=n
ENABLE_MEDIAWIKI=n
ENABLE_SCRIPT_PROVIDER_BSH=n
ENABLE_SCRIPT_PROVIDER_JS=n
@@ -622,8 +622,8 @@ OOO_EXTENSIONS_ARCHS := $(OOO_ARCH_DEP_EXTENSIONS_ARCHS)
OOO_BASE_ARCHS := $(OOO_JAVA_ARCHS)
$(eval $(call gen_no_archs,OOO_BASE_ARCHS))
-OOO_REPORTDESIGN_ARCHS := $(OOO_BASE_ARCHS)
-$(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS))
+OOO_REPORTBUILDER_ARCHS := $(OOO_BASE_ARCHS)
+$(eval $(call gen_no_archs,OOO_REPORTBUILDER_ARCHS))
OOO_FIREBIRD_ARCHS := $(OOO_LE_ARCHS)
$(eval $(call gen_no_archs,OOO_FIREBIRD_ARCHS))
# enable COLLADA (if any) only on i386/amd64 for now, rapidjson does seem
@@ -642,7 +642,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
ENABLE_SDBC_POSTGRESQL=n
ENABLE_MYSQLNATIVE=n
ENABLE_EVO2=n
- ENABLE_REPORTDESIGN=n
+ ENABLE_REPORTBUILDER=n
DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core -Nlibreoffice-base-drivers
DEBHELPER_OPTIONS += -Nlibreoffice-evolution
DEBHELPER_OPTIONS += -Nlibreoffice-sdbc-postgresql -Nlibreoffice-mysql-connector
@@ -663,7 +663,7 @@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
ENABLE_MEDIAWIKI=n
- ENABLE_REPORTDESIGN=n
+ ENABLE_REPORTBUILDER=n
ENABLE_NLPSOLVER=n
DEBHELPER_OPTIONS += -Nlibreoffice-wiki-publisher -Nlibreoffice-script-provider-python -Nlibreoffice-nlpsolver
CONFIGURE_FLAGS += --disable-extension-integration --disable-extensions
@@ -673,7 +673,7 @@ endif
ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
- ENABLE_REPORTDESIGN=n
+ ENABLE_REPORTBUILDER=n
ENABLE_MEDIAWIKI=n
ENABLE_NLPSOLVER=n
DEBHELPER_OPTIONS += -Nlibreoffice-wiki-publisher
@@ -685,9 +685,9 @@ endif
# fails to build. ("The system is out of resources."). FIXME.
ifeq (ia64,$(findstring ia64,$(OOO_OPENJDK_ARCHS)))
ifeq (,$(findstring jfreereport,$(SYSTEM_STUFF)))
- OOO_REPORTDESIGN_ARCHS := $(filter-out ia64,$(OOO_REPORTDESIGN_ARCHS))
+ OOO_REPORTBUILDER_ARCHS := $(filter-out ia64,$(OOO_REPORTBUILDER_ARCHS))
ifeq "$(DEB_HOST_ARCH)" "ia64"
- ENABLE_REPORTDESIGN=n
+ ENABLE_REPORTBUILDER=n
endif
endif
endif
@@ -1118,19 +1118,19 @@ export JAVA_HOME
ifeq "$(ENABLE_MEDIAWIKI)" "y"
CONFIGURE_FLAGS_INDEP += --enable-ext-wiki-publisher
endif
- ifeq "$(ENABLE_REPORTDESIGN)" "y"
+ ifeq "$(ENABLE_REPORTBUILDER)" "y"
# report-builder
ifneq (,$(filter jfreereport, $(SYSTEM_STUFF)))
- REPORT_BUILDER_BUILD_DEPS += , libbase-java$(OOO_NO_REPORTDESIGN_ARCHS), libsac-java$(OOO_NO_REPORTDESIGN_ARCHS), libxml-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libflute-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libpentaho-reporting-flow-engine-java (>= 0.9.4)$(OOO_NO_REPORTDESIGN_ARCHS), liblayout-java (>= 0.2.10)$(OOO_NO_REPORTDESIGN_ARCHS), libloader-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libformula-java (>= 1.1.7)$(OOO_NO_REPORTDESIGN_ARCHS), librepository-java (>= 1.1 [...]
+ REPORT_BUILDER_BUILD_DEPS += , libbase-java$(OOO_NO_REPORTBUILDER_ARCHS), libsac-java$(OOO_NO_REPORTBUILDER_ARCHS), libxml-java (>= 1.1.6)$(OOO_NO_REPORTBUILDER_ARCHS), libflute-java (>= 1.1.6)$(OOO_NO_REPORTBUILDER_ARCHS), libpentaho-reporting-flow-engine-java (>= 0.9.4)$(OOO_NO_REPORTBUILDER_ARCHS), liblayout-java (>= 0.2.10)$(OOO_NO_REPORTBUILDER_ARCHS), libloader-java (>= 1.1.6)$(OOO_NO_REPORTBUILDER_ARCHS), libformula-java (>= 1.1.7)$(OOO_NO_REPORTBUILDER_ARCHS), librepository-java [...]
REPORT_BUILDER_JAR_DEPENDS := , libbase-java, libsac-java, libxml-java (>= 1.1.6), libflute-java (>= 1.1.6), libpentaho-reporting-flow-engine-java (>= 0.9.4), liblayout-java (>= 0.2.10), libloader-java (>= 1.1.6), libformula-java (>= 1.1.7), librepository-java (>= 1.1.6), libfonts-java (>= 1.1.6), libserializer-java (>= 1.1.6)
CONFIGURE_FLAGS += --with-libbase-jar=/usr/share/java/libbase.jar --with-libxml-jar=/usr/share/java/libxml.jar --with-flute-jar=/usr/share/java/flute.jar --with-jfreereport-jar=/usr/share/java/flow-engine.jar --with-liblayout-jar=/usr/share/java/liblayout.jar --with-libloader-jar=/usr/share/java/libloader.jar --with-libformula-jar=/usr/share/java/libformula.jar --with-librepository-jar=/usr/share/java/librepository.jar --with-libfonts-jar=/usr/share/java/libfonts.jar --with-libserialize [...]
endif
ifneq (,$(filter apache-commons, $(SYSTEM_STUFF)))
REPORT_BUILDER_BUILD_DEPS += , libcommons-logging-java$(OOO_NO_JAVA_ARCHS)
REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java
- CONFIGURE_FLAGS_INDEP += --with-commons-logging-jar=/usr/share/java/commons-logging.jar
+ CONFIGURE_FLAGS += --with-commons-logging-jar=/usr/share/java/commons-logging.jar
endif
- BUILD_DEPS_INDEP += $(REPORT_BUILDER_BUILD_DEPS)
+ BUILD_DEPS += $(REPORT_BUILDER_BUILD_DEPS)
else
CONFIGURE_FLAGS += --disable-report-builder
endif
@@ -1807,7 +1807,7 @@ ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(ENABLE_MEDIAWIKI)" "y"
cat debian/control.mediawiki.in >> debian/control
endif
- ifeq "$(ENABLE_REPORTDESIGN)" "y"
+ ifeq "$(ENABLE_REPORTBUILDER)" "y"
cat debian/control.reportdesign.in >> debian/control
endif
ifeq "$(ENABLE_NLPSOLVER)" "y"
@@ -1855,8 +1855,8 @@ endif
perl -pi -e "s,%OOO_NO_BASE_ARCHS%,$(OOO_NO_BASE_ARCHS),"g debian/control
perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control
perl -pi -e "s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g" debian/control
- perl -pi -e "s,%OOO_REPORTDESIGN_ARCHS%,$(OOO_REPORTDESIGN_ARCHS),g" debian/control
- perl -pi -e "s,%OOO_NO_REPORTDESIGN_ARCHS%,$(OOO_NO_REPORTDESIGN_ARCHS),g" debian/control
+ perl -pi -e "s,%OOO_REPORTBUILDER_ARCHS%,$(OOO_REPORTBUILDER_ARCHS),g" debian/control
+ perl -pi -e "s,%OOO_NO_REPORTBUILDER_ARCHS%,$(OOO_NO_REPORTBUILDER_ARCHS),g" debian/control
perl -pi -e "s,%OOO_FIREBIRD_ARCHS%,$(OOO_FIREBIRD_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NO_FIREBIRD_ARCHS%,$(OOO_NO_FIREBIRD_ARCHS),g" debian/control
perl -pi -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" debian/control
@@ -1959,7 +1959,7 @@ build:
build-arch: $(STAMP_DIR)/prepare $(STAMP_DIR)/build-arch
$(STAMP_DIR)/build-arch:
-#build-arch: ENABLE_HELP = n PACKAGE_SDK_DOCS = n ENABLE_MEDIAWIKI = n ENABLE_REPORTDESIGN = n ENABLE_SCRIPT_PROVIDER_BSH = n ENABLE_SCRIPT_PROVIDER_JS = n
+#build-arch: ENABLE_HELP = n PACKAGE_SDK_DOCS = n ENABLE_MEDIAWIKI = n ENABLE_SCRIPT_PROVIDER_BSH = n ENABLE_SCRIPT_PROVIDER_JS = n
dh_testdir
# Theoretically this should call ./configure instead of
@@ -1972,9 +1972,9 @@ $(STAMP_DIR)/build-arch:
OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
./autogen.sh $(CONFIGURE_FLAGS) --without-junit --without-cppunit \
- --without-doxygen --without-javadoc --disable-ext-wiki-publisher \
- --disable-report-builder --disable-scripting-javascript \
- --disable-scripting-beanshell \
+ --disable-ext-wiki-publisher \
+ --disable-scripting-javascript --disable-scripting-beanshell \
+ --without-doxygen --without-javadoc \
--with-galleries=no --with-theme="$(DEFAULT_IMAGE)"
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-non-l10n-only
@@ -2043,9 +2043,9 @@ endif
OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
./autogen.sh $(CONFIGURE_FLAGS) \
- --without-doxygen --without-javadoc --disable-ext-wiki-publisher \
- --disable-report-builder --disable-scripting-javascript \
- --disable-scripting-beanshell \
+ --disable-ext-wiki-publisher \
+ --disable-scripting-javascript --disable-scripting-beanshell \
+ --without-doxygen --without-javadoc \
--with-galleries=no --with-theme="$(DEFAULT_IMAGE)"
# generate the needed en_US.UTF-8. Upstream doesn't want to support
@@ -2487,7 +2487,7 @@ else
rm -f $(PKGDIR)-common/$(OODIR)/program/gengal
endif
-ifneq "$(ENABLE_REPORTDESIGN)" "y"
+ifneq "$(ENABLE_REPORTBUILDER)" "y"
# unneeded. a no-Java arch, so the report-builder can't work anyway.
# (and we need to remove it here anyway as it otherwise would end up
# in -base/-core)
@@ -3667,7 +3667,7 @@ ifeq "$(ENABLE_NLPSOLVER)" "y"
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-v$(shell grep "<version" $(SOURCE_TREE)/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
-ifeq "$(ENABLE_REPORTDESIGN)" "y"
+ifeq "$(ENABLE_REPORTBUILDER)" "y"
dh_gencontrol -plibreoffice-report-builder -- \
-V'base-version=$(BASE_VERSION)' \
-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list