RepositoryExternal.mk | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit b635846280c8fb4fb4d68f95af383ef1337eb430
Author: Michael Warner <michael.warner.ut+libreoff...@gmail.com>
AuthorDate: Fri Nov 12 08:13:16 2021 -0500
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 15 18:36:10 2021 +0100
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 <michael.st...@allotropia.de>
Tested-by: Jenkins
(cherry picked from commit 6ea7ca45782a7e1b46e18e994534ec0a7c71951b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125140
Reviewed-by: Michael Warner <michael.warner.ut+libreoff...@gmail.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 7a87e2c7324f..d64fb8ffd57a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2806,6 +2806,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)
@@ -2817,7 +2821,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)
