fdo#70393: move mythes to a subdir of external

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

11 files changed, 5 insertions, 7 deletions

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index e03523b9c1e0..dba46e69bc1e 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
 	$(call gb_Helper_optional,MOZ,moz) \
 	$(call gb_Helper_optional,MARIADBC,mysqlc) \
-	$(call gb_Helper_optional,MYTHES,mythes) \
 	$(call gb_Helper_optional,NEON,neon) \
 	$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
 	np_sdk \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index bb949c409411..c0b95e0f29ab 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,MSPUB,libmspub) \
 	$(call gb_Helper_optional,MWAW,libmwaw) \
 	$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
+	$(call gb_Helper_optional,MYTHES,mythes) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
 	$(call gb_Helper_optional,VISIO,libvisio) \
diff --git a/mythes/ExternalProject_mythes.mk b/external/mythes/ExternalProject_mythes.mk
index 8681cc292e12..8681cc292e12 100644
--- a/mythes/ExternalProject_mythes.mk
+++ b/external/mythes/ExternalProject_mythes.mk
diff --git a/mythes/Makefile b/external/mythes/Makefile
index ccb1c85a04da..e4968cf85fb6 100644
--- a/mythes/Makefile
+++ b/external/mythes/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:
diff --git a/mythes/Module_mythes.mk b/external/mythes/Module_mythes.mk
index 4d9ac64ee926..56d95fc9179d 100644
--- a/mythes/Module_mythes.mk
+++ b/external/mythes/Module_mythes.mk
@@ -9,7 +9,6 @@
 
 $(eval $(call gb_Module_Module,mythes))
 
-ifeq ($(SYSTEM_MYTHES),NO)
 $(eval $(call gb_Module_add_targets,mythes,\
 	UnpackedTarball_mythes \
 ))
@@ -22,6 +21,5 @@ $(eval $(call gb_Module_add_targets,mythes,\
 	ExternalProject_mythes \
 ))
 endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/mythes/README b/external/mythes/README
index 8a1792ee05b3..8a1792ee05b3 100644
--- a/mythes/README
+++ b/external/mythes/README
diff --git a/mythes/StaticLibrary_mythes.mk b/external/mythes/StaticLibrary_mythes.mk
index d955b6a025e7..d955b6a025e7 100644
--- a/mythes/StaticLibrary_mythes.mk
+++ b/external/mythes/StaticLibrary_mythes.mk
diff --git a/mythes/UnpackedTarball_mythes.mk b/external/mythes/UnpackedTarball_mythes.mk
index a4928af84124..d2d4e1d6e772 100644
--- a/mythes/UnpackedTarball_mythes.mk
+++ b/external/mythes/UnpackedTarball_mythes.mk
@@ -12,9 +12,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mythes))
 $(eval $(call gb_UnpackedTarball_set_tarball,mythes,$(MYTHES_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,mythes,\
-	mythes/mythes-1.2.0-vanilla-th-gen-idx.patch \
-	mythes/mythes-1.2.0-android.patch \
-	mythes/mythes-ssizet.patch \
+	external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch \
+	external/mythes/mythes-1.2.0-android.patch \
+	external/mythes/mythes-ssizet.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/mythes/mythes-1.2.0-android.patch b/external/mythes/mythes-1.2.0-android.patch
index 9b5293876281..9b5293876281 100644
--- a/mythes/mythes-1.2.0-android.patch
+++ b/external/mythes/mythes-1.2.0-android.patch
diff --git a/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch b/external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch
index 3752e291200e..3752e291200e 100644
--- a/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch
+++ b/external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch
diff --git a/mythes/mythes-ssizet.patch b/external/mythes/mythes-ssizet.patch
index 25d95165d8f2..25d95165d8f2 100644
--- a/mythes/mythes-ssizet.patch
+++ b/external/mythes/mythes-ssizet.patch