fdo#70393: move graphite to a subdir of external

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

RepositoryModule_host.mk

@@ -55,7 +55,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	formula \
 	fpicker \
 	framework \
-	$(call gb_Helper_optional,GRAPHITE,graphite) \
 	$(call gb_Helper_optional,DESKTOP,helpcompiler) \
 	$(call gb_Helper_optional,HELP,helpcontent2) \
 	$(call gb_Helper_optional,HSQLDB,hsqldb) \

external/Module_external.mk

@@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,FIREBIRD,firebird) \
 	$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
 	$(call gb_Helper_optional,FREETYPE,freetype) \
+	$(call gb_Helper_optional,GRAPHITE,graphite) \
 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \

graphite/Module_graphite.mk → external/graphite/Module_graphite.mk

@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,graphite))
 
-ifeq ($(SYSTEM_GRAPHITE),NO)
-
 $(eval $(call gb_Module_add_targets,graphite,\
 	StaticLibrary_graphite \
 	UnpackedTarball_graphite \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:

graphite/UnpackedTarball_graphite.mk → external/graphite/UnpackedTarball_graphite.mk

@@ -14,8 +14,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL)))
 # http://projects.palaso.org/issues/1030
 # http://projects.palaso.org/issues/1115
 $(eval $(call gb_UnpackedTarball_add_patches,graphite,\
-	graphite/graphite2.patch \
-	graphite/graphite2.issue1115.patch.1 \
+	external/graphite/graphite2.patch \
+	external/graphite/graphite2.issue1115.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4: