[libreoffice] 03/03: give in and install upstream-generated fontconfig stuff

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 82df501238823a4351d9ada78c50ca9a31597465
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Dec 14 23:22:31 2017 +0100

    give in and install upstream-generated fontconfig stuff
---
 rules | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/rules b/rules
index 0626688..bfc859d 100755
--- a/rules
+++ b/rules
@@ -3223,26 +3223,12 @@ endif
 		ln -s /usr/share/doc/libreoffice-common/examples/$$i $(PKGDIR)-common/$(OODIR)/share/registry/$$i; \
 	done
 
-	# install font config. Doesn't get installed with
-	# --without-fonts.
-	# FIXME: Shouldn't this be in /etc/fonts/conf.d with a symlink here?
-	install -m644 -D workdir/CustomTarget/postprocess/fontconfig/fc_local.conf \
-		$(PKGDIR)-common/$(OODIR)/share/fonts/truetype/fc_local.conf
 ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
-	# generate fontconfig file. Upstream creates a fc_local.conf in
-	# postprocess but it might also contain other font stuff, so do it
-	# manually
-	mkdir -p debian/fonts-opensymbol/usr/share/fontconfig/conf.avail
-	mkdir -p debian/fonts-opensymbol/etc/fonts.d/
-	( \
-	  echo "<?xml version="1.0"?>"; \
-	  echo "<!DOCTYPE fontconfig SYSTEM "fonts.dtd">"; \
-	  echo "<fontconfig>"; \
-	) > debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
-	cat $(SOURCE_TREE)/extras/source/truetype/symbol/fc_local.snippet >> debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
-	echo "</fontconfig>" >> debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
-	cd debian/fonts-opensymbol/etc/fonts.d/ && \
-		ln -s /usr/share/fontconfig/conf.avail/30_opensymbol.conf
+	# this only works with --without-fonts. Otherwise we get all stuff here,
+	# not only the Symbol->OpenSymbol part... But we don't support --with-fonts
+	# build here right now anyway.
+	install -m644 -D workdir/CustomTarget/postprocess/fontconfig/fc_local.conf \
+		debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
 endif
 
 	# register technical.dic

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git