fdo#70393: move fontconfig to a subdir of external

Change-Id: I467e83b4c1ca938f5cdc333d9af103bcd01832f2
Reviewed-on: https://gerrit.libreoffice.org/6303
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

RepositoryModule_host.mk

@@ -51,7 +51,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	extras \
 	fileaccess \
 	filter \
-	$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,forms) \
 	formula \
 	fpicker \

external/Module_external.mk

@@ -30,6 +30,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,EPM,epm) \
 	$(call gb_Helper_optional,EXPAT,expat) \
 	$(call gb_Helper_optional,FIREBIRD,firebird) \
+	$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \

external/fontconfig/UnpackedTarball_fontconfig.mk

@@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,fontconfig,$(FONTCONFIG_TARBALL),,f
 $(eval $(call gb_UnpackedTarball_set_patchlevel,fontconfig,3))
 
 $(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\
-	fontconfig/fontconfig-2.8.0.patch \
+	external/fontconfig/fontconfig-2.8.0.patch \
 ))
 
 # vim: set noet sw=4 ts=4: