fdo#70393: move poppler to a subdir of external

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

RepositoryModule_host.mk

@@ -85,7 +85,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	oox \
 	package \
 	padmin \
-	$(call gb_Helper_optional,POPPLER,poppler) \
 	$(call gb_Helper_optional,POSTGRESQL,postgresql) \
 	postprocess \
 	psprint_config \

external/Module_external.mk

@@ -68,6 +68,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,OPENLDAP,openldap) \
 	$(call gb_Helper_optional,OPENSSL,openssl) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
+	$(call gb_Helper_optional,POPPLER,poppler) \
 	$(call gb_Helper_optional,VISIO,libvisio) \
 	$(call gb_Helper_optional,WPD,libwpd) \
 	$(call gb_Helper_optional,WPG,libwpg) \

external/poppler/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/poppler/UnpackedTarball_poppler.mk

@@ -12,10 +12,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,poppler))
 $(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler))
 
 $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
-	poppler/poppler-notests.patch.1 \
-	poppler/poppler-snprintf.patch.1 \
-	poppler/poppler-mac-fake.patch.1 \
-	poppler/poppler-nochecknew.patch.1 \
+	external/poppler/poppler-notests.patch.1 \
+	external/poppler/poppler-snprintf.patch.1 \
+	external/poppler/poppler-mac-fake.patch.1 \
+	external/poppler/poppler-nochecknew.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4: