From 36067ebde25a1dfd4724d278baded0ae84a3faf0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 31 May 2026 23:44:00 +0200 Subject: [PATCH] package/poppler: needs zlib Buildroot commit cdd1c5ca55620a4bdd1574d41fc5538d50f7359a bumped the package from version 22.12.0 to 25.10.0 but forgot to change zlib into a mandatory dependency. This is necessary due to upstream commit https://gitlab.freedesktop.org/poppler/poppler/-/commit/7d87c7d2c6ca4f814f87329534a17dbf30203313 since version 23.07.0. Fixes: https://autobuild.buildroot.net/results/85f/85fb6c2945101b8d4ee86dbc32700293e7b35a86/ CMake Error at /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:290 (message): Could NOT find ZLIB (missing: ZLIB_LIBRARY ZLIB_INCLUDE_DIR) Call Stack (most recent call first): /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:654 (_FPHSA_FAILURE_MESSAGE) /usr/share/cmake/Modules/FindZLIB.cmake:242 (find_package_handle_standard_args) CMakeLists.txt:309 (find_package) Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 7a9486d7d6595d37b0a8c096408a51503a1d1f59) Signed-off-by: Thomas Perale --- package/poppler/Config.in | 1 + package/poppler/poppler.mk | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/package/poppler/Config.in b/package/poppler/Config.in index 21c4d86cf6..208126a327 100644 --- a/package/poppler/Config.in +++ b/package/poppler/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_POPPLER depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 select BR2_PACKAGE_FONTCONFIG + select BR2_PACKAGE_ZLIB help Poppler is a PDF rendering library based on the xpdf-3.0 code base. diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 08214d38b4..535c2b7b10 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -7,7 +7,7 @@ POPPLER_VERSION = 25.10.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz POPPLER_SITE = https://poppler.freedesktop.org -POPPLER_DEPENDENCIES = fontconfig host-pkgconf +POPPLER_DEPENDENCIES = fontconfig host-pkgconf zlib POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING POPPLER_CPE_ID_VENDOR = freedesktop @@ -95,13 +95,6 @@ else POPPLER_CONF_OPTS += -DENABLE_UTILS=OFF endif -ifeq ($(BR2_PACKAGE_ZLIB),y) -POPPLER_DEPENDENCIES += zlib -POPPLER_CONF_OPTS += -DENABLE_ZLIB_UNCOMPRESS=ON -else -POPPLER_CONF_OPTS += -DENABLE_ZLIB_UNCOMPRESS=OFF -endif - ifeq ($(BR2_PACKAGE_CAIRO),y) POPPLER_DEPENDENCIES += cairo POPPLER_CONF_OPTS += -DWITH_Cairo=ON