Make font-based unit test depend on instdir fonts

The current dependency is already a hack, because there is no way
I know of to depend on delivered top-level modules like more_fonts.
The original patch parses the gb_Package_MODULE_ooo_fonts list of
registered packages to add them as build dependencies.

But this is not sufficient, as it just adds the dependencies on the
installed / unpacked fonts in the workdir (actually it's just the
installer filelist), where they can't be found by the unit test
running in the instdir environment.

So this converts the depndency into a make error, if either the
filelist is missing or the included font files. But if we are in
a full run and know the more_fonts module, we simply depend on its
delivered files.

This needs some minimal changes to gbuild, as neither the delivered
file list nor the modules class names are yet available. And this
moves the fontconfig handling to extras, where the opensymbol font
is already handled.

Change-Id: I1b70a4c45ff189266ce56c57e534ddc45e7c5c19
Reviewed-on: https://gerrit.libreoffice.org/74624
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>

3 files changed, 0 insertions, 61 deletions

diff --git a/postprocess/CustomTarget_fontconfig.mk b/postprocess/CustomTarget_fontconfig.mk
deleted file mode 100644
index 72ff3f3cf1b0..000000000000
--- a/postprocess/CustomTarget_fontconfig.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 100 -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,postprocess/fontconfig))
-
-$(call gb_CustomTarget_get_workdir,postprocess/fontconfig)/fc_local.conf: \
-    $(SRCDIR)/extras/source/truetype/symbol/fc_local.snippet \
-    $(SRCDIR)/postprocess/CustomTarget_fontconfig.mk \
-    | $(call gb_CustomTarget_get_workdir,postprocess/fontconfig)/.dir
-
-ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
-$(call gb_CustomTarget_get_workdir,postprocess/fontconfig)/fc_local.conf: \
-    $(SRCDIR)/external/more_fonts/fc_local.snippet
-endif
-
-$(call gb_CustomTarget_get_workdir,postprocess/fontconfig)/fc_local.conf:
-	printf '<?xml version="1.0"?>\n<!DOCTYPE fontconfig SYSTEM "/etc/fonts/conf.d/fonts.dtd">\n<fontconfig>\n' >$@
-	cat $(SRCDIR)/extras/source/truetype/symbol/fc_local.snippet >>$@
-ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
-	cat $(SRCDIR)/external/more_fonts/fc_local.snippet >>$@
-endif
-	printf '</fontconfig>\n' >>$@
-
-# vim: set noet sw=4 ts=4:
diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk
index 4671cbc84508..9ccc41552f38 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -28,19 +28,6 @@ $(eval $(call gb_Module_add_targets,postprocess,\
 ))
 endif
 
-# For configurations that use fontconfig (cf. inclusion of
-# vcl/unx/generic/fontmanager/fontconfig.cxx in Library_vcl), add
-# instdir/share/fonts/truetype/fc_local.conf when it shall
-# contain content from at least one of external/more_fonts/fc_local.snippet
-# (conditional on MORE_FONTS in BUILD_TYPE) and
-# extras/source/truetype/symbol/fc_local.snippet (unconditional):
-ifneq ($(USING_X11)$(DISABLE_GUI)$(filter ANDROID,$(OS)),)
-$(eval $(call gb_Module_add_targets,postprocess, \
-    CustomTarget_fontconfig \
-    Package_fontconfig \
-))
-endif
-
 ifeq ($(OS),LINUX)
 ifneq ($(PKGFORMAT),)
 $(eval $(call gb_Module_add_check_targets,postprocess,\
diff --git a/postprocess/Package_fontconfig.mk b/postprocess/Package_fontconfig.mk
deleted file mode 100644
index 37f096e5028e..000000000000
--- a/postprocess/Package_fontconfig.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 100 -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,postprocess_fontconfig,$(call gb_CustomTarget_get_workdir,postprocess/fontconfig)))
-
-$(eval $(call gb_Package_add_files,postprocess_fontconfig,$(LIBO_SHARE_FOLDER)/fonts/truetype, \
-    fc_local.conf \
-))
-
-$(eval $(call gb_Package_use_custom_target,postprocess_fontconfig,postprocess/fontconfig))
-
-# vim: set noet sw=4 ts=4: