fdo#70393: move hunspell to a subdir of external

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

RepositoryModule_host.mk

@@ -57,7 +57,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	framework \
 	$(call gb_Helper_optional,DESKTOP,helpcompiler) \
 	$(call gb_Helper_optional,HELP,helpcontent2) \
-	$(call gb_Helper_optional,HUNSPELL,hunspell) \
 	hwpfilter \
 	$(call gb_Helper_optional,HYPHEN,hyphen) \
 	i18nlangtag \

external/Module_external.mk

@@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,GRAPHITE,graphite) \
 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
 	$(call gb_Helper_optional,HSQLDB,hsqldb) \
+	$(call gb_Helper_optional,HUNSPELL,hunspell) \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 ))

hunspell/Module_hunspell.mk → external/hunspell/Module_hunspell.mk

@@ -9,7 +9,6 @@
 
 $(eval $(call gb_Module_Module,hunspell))
 
-ifeq ($(SYSTEM_HUNSPELL),NO)
 $(eval $(call gb_Module_add_targets,hunspell,\
 	UnpackedTarball_hunspell \
 ))
@@ -22,6 +21,5 @@ $(eval $(call gb_Module_add_targets,hunspell,\
 	ExternalProject_hunspell \
 ))
 endif
-endif
 
 # vim: set noet sw=4 ts=4:

hunspell/UnpackedTarball_hunspell.mk → external/hunspell/UnpackedTarball_hunspell.mk

@@ -12,15 +12,15 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,hunspell))
 $(eval $(call gb_UnpackedTarball_set_tarball,hunspell,$(HUNSPELL_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,hunspell,\
-	hunspell/hunspell-twoaffixcompound.patch \
-	hunspell/hunspell-solaris.patch \
-	hunspell/hunspell-1.3.2-overflow.patch \
-	hunspell/hunspell-android.patch \
-	hunspell/hunspell-1.3.2-nullptr.patch \
-	hunspell/hunspell-1.3.2-literal.patch \
-	hunspell/hunspell-1.3.2-compound.patch \
-	hunspell/hunspell.rhbz918938.patch \
-	hunspell/hunspell-wundef.patch.1 \
+	external/hunspell/hunspell-twoaffixcompound.patch \
+	external/hunspell/hunspell-solaris.patch \
+	external/hunspell/hunspell-1.3.2-overflow.patch \
+	external/hunspell/hunspell-android.patch \
+	external/hunspell/hunspell-1.3.2-nullptr.patch \
+	external/hunspell/hunspell-1.3.2-literal.patch \
+	external/hunspell/hunspell-1.3.2-compound.patch \
+	external/hunspell/hunspell.rhbz918938.patch \
+	external/hunspell/hunspell-wundef.patch.1 \
 ))
 
 ifeq ($(COM),MSC)