[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3_rc1-3-82-g69f611d
The following commit has been merged in the debian-experimental-4.1 branch:
commit 0ca0cbbcfcd3aadc863a1ed550b25731792adf41
Author: Rene Engelhard <rene@debian.org>
Date: Thu Apr 25 00:22:49 2013 +0200
add harfbuzz conditional
diff --git a/rules b/rules
index 8437c88..3a6bdba 100755
--- a/rules
+++ b/rules
@@ -318,6 +318,10 @@ endif
PACKAGE_BASE=y
ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
+# not complete yet and needs a export SAL_USE_HARFBUZZ to be enabled
+# anyway
+ENABLE_HARFBUZZ=n
+SYSTEM_STUFF += harfbuzz
ALLOC=system
SYSTEM_STUFF += libexttextcat
SYSTEM_STUFF += cppunit
@@ -528,7 +532,7 @@ $(eval $(call gen_no_archs,OOO_NSPLUGIN_ARCHS))
# Debian WHeezy
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "wheezy-backports"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw mdds liblangtag orcus, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw mdds liblangtag orcus harfbuzz, $(SYSTEM_STUFF))
WHEEZY_BACKPORT=y
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@ -593,6 +597,13 @@ else
CONFIGURE_FLAGS += --disable-graphite
endif
+ifeq "$(ENABLE_HARFBUZZ)" "y"
+ ifneq (,$(filter harfbuzz, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libharfbuzz-dev
+ endif
+ CONFIGURE_FLAGS += --enable-harfbuzz
+endif
+
ifneq (,$(filter libexttextcat, $(SYSTEM_STUFF)))
BUILD_DEPS += , libexttextcat-dev (>= 3.1.1)
--
LibreOffice packaging repository
Reply to: