fdo#70393: move liborcus to a subdir of external

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

RepositoryModule_host.mk

@@ -70,7 +70,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	jvmaccess \
 	jvmfwk \
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
-	$(call gb_Helper_optional,ORCUS,liborcus) \
 	librelogo \
 	$(call gb_Helper_optional,VISIO,libvisio) \
 	$(call gb_Helper_optional,WPD,libwpd) \

external/Module_external.mk

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

liborcus/Makefile → external/liborcus/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:

liborcus/Module_liborcus.mk → external/liborcus/Module_liborcus.mk

@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,liborcus))
 
-ifeq ($(ENABLE_ORCUS)-$(SYSTEM_LIBORCUS),TRUE-NO)
-
 $(eval $(call gb_Module_add_targets,liborcus,\
 	ExternalProject_liborcus \
 	UnpackedTarball_liborcus \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:

liborcus/UnpackedTarball_liborcus.mk → external/liborcus/UnpackedTarball_liborcus.mk

@@ -35,7 +35,7 @@ endif
 # f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
 
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
-	$(foreach patch,$(liborcus_patches),liborcus/$(patch)) \
+	$(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \
 ))
 
 # vim: set noet sw=4 ts=4: