From 6ea7ca45782a7e1b46e18e994534ec0a7c71951b Mon Sep 17 00:00:00 2001 From: Michael Warner Date: Fri, 12 Nov 2021 08:13:16 -0500 Subject: [PATCH] tdf#141709 Register poppler_data for install Added call to gb_Helper_register_packages_for_install to RepositoryExternal.mk for poppler_data. Change-Id: Ie65ff0083d2c731486254066db2034e3bd4a99a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125108 Reviewed-by: Michael Stahl Tested-by: Jenkins --- RepositoryExternal.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a2a7212aa837..e63ab24dba27 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2815,6 +2815,10 @@ endef else # !SYSTEM_POPPLER +$(eval $(call gb_Helper_register_packages_for_install,pdfimport,\ + poppler_data \ +)) + define gb_LinkTarget__use_poppler $(call gb_LinkTarget_use_external_project,$(1),poppler,full) $(call gb_LinkTarget_use_package,$(1),poppler_data) @@ -2826,7 +2830,6 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_use_static_libraries,$(1),poppler) - $(call gb_LinkTarget_use_external,$(1),libjpeg) ifeq ($(OS),MACOSX)