fdo#70393: move libvisio to a subdir of external

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

RepositoryModule_host.mk

@@ -71,7 +71,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	jvmfwk \
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
 	librelogo \
-	$(call gb_Helper_optional,VISIO,libvisio) \
 	$(call gb_Helper_optional,WPD,libwpd) \
 	$(call gb_Helper_optional,WPG,libwpg) \
 	$(call gb_Helper_optional,WPS,libwps) \

external/Module_external.mk

@@ -50,6 +50,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,MWAW,libmwaw) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
+	$(call gb_Helper_optional,VISIO,libvisio) \
 ))
 
 # vim: set noet sw=4 ts=4:

external/libvisio/Makefile

@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:

external/libvisio/Module_libvisio.mk

@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,libvisio))
 
-ifeq ($(SYSTEM_VISIO),NO)
-
 $(eval $(call gb_Module_add_targets,libvisio,\
 	ExternalProject_libvisio \
 	UnpackedTarball_libvisio \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:

external/libvisio/UnpackedTarball_libvisio.mk

@@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libvisio,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
-	libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch \
+	external/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch \
 ))
 
 # vim: set noet sw=4 ts=4: