commit: 66c532846c5e5087cd6a74855aba8eb02991814a Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Feb 10 05:46:38 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Feb 10 05:46:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c53284
app-text/qpdf: Bump to 11.10.0 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> app-text/qpdf/Manifest | 3 + app-text/qpdf/files/qpdf-11.10.0-zopfli-inc.patch | 38 ++++++++ app-text/qpdf/metadata.xml | 6 ++ app-text/qpdf/qpdf-11.10.0.ebuild | 106 ++++++++++++++++++++++ 4 files changed, 153 insertions(+) diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest index 62bdf134862c..85287cb46242 100644 --- a/app-text/qpdf/Manifest +++ b/app-text/qpdf/Manifest @@ -1,3 +1,6 @@ +DIST qpdf-11.10.0-doc.zip 16605842 BLAKE2B 17dcad5daa6490666e04fff94152683b75b5e3579f4c1c46340cd6f6b847a4d4251d08c353bdcf5e34ea2043ad3ddbd13e4965db993103f9500206543c2a3d5d SHA512 afa095957fbd98ddf645021dd24addafb140f5ed07d048117999f0cb7e5a1a713b3cce8530d43f4ea3f1e83996479b1d052ef74e21bfd31bf214a1b2e77e5e3f +DIST qpdf-11.10.0.tar.gz 19487550 BLAKE2B ea104ebedece94e6c6736add58e4139c5b8aa56e7679362cd15692be6ec54f47c95b9b3c654c53d7625fba6d4eec71ba3596896843f316b69e1976f87a7d7283 SHA512 7dfaba277fc3b3ccc0087b005c0a9f0184bde9618c73d6044604669d3d2bd0bbdf44eb4573474819bdb743e38a61e86fdcfd4512ccde07fa510461fb3738a1bd +DIST qpdf-11.10.0.tar.gz.asc 833 BLAKE2B 63c278550807af8fe304cd2961881f32ea9a4db793f37b7ede0ebe47358c1ef5a468213c947354ec79ff90f2eed488e3a7e550d27f90928a790c03b2b8a64988 SHA512 92b86c642ab7c7d129474f57897d7694f3e0f4c28b1f8575572130a5d87fc9da272b753083fa53986c1b853a8a2f3f1e7c82043febb9bb2832279d74edacb7a4 DIST qpdf-11.7.0-doc.zip 6874893 BLAKE2B b14b0f68f4599bd4f396cccbc35b13b0f52b72856de1afd3fdb0c70b33e1702c4afd7c954011df72905c06ff262b08dc9519e44dcef9b7633423d38208542795 SHA512 7ceeff62788defe3649a8d242220c7c8208ebe92dbd9d67b4b53d5036afb1cdbcfe46b4140b064b0542cba2d8eaaad6eedec1ed7b7bd0ccafe2dd7aa20efaa69 DIST qpdf-11.7.0.tar.gz 18124824 BLAKE2B aa10e154899a7fd53d696b9521cc8a44d4a336094711ddc2a506dac8841ae12ce5bcd604555725d2b6bae3c63a6a3f6ef0e9ab6baf38dd3d7fa71507234378a3 SHA512 6ee302671fd4513c5b22f101feb773b4101de6cc5ff6b0e25d1daa03df82420f87ce7db49a6c47758d7e8bbc3beeb997d4671d52e4cf0ac0d4f817f10677d1f9 DIST qpdf-11.7.0.tar.gz.asc 833 BLAKE2B e0b15e6ed6b67fc222f7b4d9f863e8630af814bede3605ca56b83b287d7e02c700092e59f3805565884b55af96c4ddd407331cae26273287b546c32a7975c331 SHA512 ef5aa1661944fd56c3f929ee1ffc78229667ed1d1c639aab82a0ff3a3891455e4dcf3dffbb17e9d22862d6426a263182360b19dd58435a2413c19761abc9b966 diff --git a/app-text/qpdf/files/qpdf-11.10.0-zopfli-inc.patch b/app-text/qpdf/files/qpdf-11.10.0-zopfli-inc.patch new file mode 100644 index 000000000000..2ab7c83b6a68 --- /dev/null +++ b/app-text/qpdf/files/qpdf-11.10.0-zopfli-inc.patch @@ -0,0 +1,38 @@ +From bbff557f8c63cd1b9405738f202b70e1067014ae Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> +Date: Mon, 10 Feb 2025 06:26:45 +0100 +Subject: [PATCH] Fix build against a standard zopfli install + +Fix the logic to accept a top-level `zopfli.h` header, as that is +the location used by upstream's build system. +--- + libqpdf/CMakeLists.txt | 2 +- + libqpdf/Pl_Flate.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libqpdf/CMakeLists.txt b/libqpdf/CMakeLists.txt +index 285afb86..91344a59 100644 +--- a/libqpdf/CMakeLists.txt ++++ b/libqpdf/CMakeLists.txt +@@ -192,7 +192,7 @@ if(NOT EXTERNAL_LIBS) + endif() + + if(ZOPFLI) +- find_path(ZOPFLI_H_PATH zopfli/zopfli.h) ++ find_path(ZOPFLI_H_PATH NAMES zopfli.h PATH_SUFFIXES zopfli) + find_library(ZOPFLI_LIB_PATH NAMES zopfli) + if(ZOPFLI_H_PATH AND ZOPFLI_LIB_PATH) + list(APPEND dep_include_directories ${ZOPFLI_H_PATH}) +diff --git a/libqpdf/Pl_Flate.cc b/libqpdf/Pl_Flate.cc +index 97a337b4..724b4435 100644 +--- a/libqpdf/Pl_Flate.cc ++++ b/libqpdf/Pl_Flate.cc +@@ -9,7 +9,7 @@ + #include <qpdf/qpdf-config.h> + + #ifdef ZOPFLI +-# include <zopfli/zopfli.h> ++# include <zopfli.h> + #endif + + namespace diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml index 9248740ded39..c1d81ad48c72 100644 --- a/app-text/qpdf/metadata.xml +++ b/app-text/qpdf/metadata.xml @@ -10,4 +10,10 @@ <remote-id type="github">qpdf/qpdf</remote-id> <remote-id type="sourceforge">qpdf</remote-id> </upstream> + <use> + <flag name="zopfli"> + Support using <pkg>app-arch/zopfli</pkg> for stronger + zlib-compatible compression. + </flag> + </use> </pkgmetadata> diff --git a/app-text/qpdf/qpdf-11.10.0.ebuild b/app-text/qpdf/qpdf-11.10.0.ebuild new file mode 100644 index 000000000000..9e7dae0c4ace --- /dev/null +++ b/app-text/qpdf/qpdf-11.10.0.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 cmake verify-sig + +DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files" +HOMEPAGE=" + https://qpdf.sourceforge.io/ + https://github.com/qpdf/qpdf/ +" +SRC_URI=" + https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz + doc? ( + https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip + ) + verify-sig? ( + https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz.asc + ) +" + +LICENSE="|| ( Apache-2.0 Artistic-2 )" +# Subslot for libqpdf soname version (just represent via major version) +SLOT="0/$(ver_cut 1)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples gnutls test zopfli" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/libjpeg-turbo:= + sys-libs/zlib + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( dev-libs/openssl:= ) + zopfli? ( app-arch/zopfli:= ) +" +DEPEND=" + ${RDEPEND} + test? ( + app-text/ghostscript-gpl[tiff(+)] + media-libs/tiff + sys-apps/diffutils + ) +" +BDEPEND=" + dev-lang/perl + doc? ( app-arch/unzip ) + verify-sig? ( sec-keys/openpgp-keys-jberkenbilt ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( + # glibc only (bug #899052) + malloc_info +) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jberkenbilt.asc + +PATCHES=( + # https://github.com/qpdf/qpdf/pull/1359 + "${FILESDIR}/${P}-zopfli-inc.patch" +) + +src_unpack() { + if use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + +src_configure() { + local crypto_provider=$(usex gnutls GNUTLS OPENSSL) + local crypto_provider_lowercase=${crypto_provider,,} + + # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html. + local mycmakeargs=( + -DINSTALL_EXAMPLES=$(usex examples) + -DZOPFLI=$(usex zopfli) + + # Avoid automagic crypto deps + -DUSE_IMPLICIT_CRYPTO=OFF + -DALLOW_CRYPTO_NATIVE=ON + + # Breaks install with USE=-doc in 11.0.0? + #-DINSTALL_MANUAL=ON + + -DDEFAULT_CRYPTO=${crypto_provider_lowercase} + -DREQUIRE_CRYPTO_${crypto_provider}=ON + ) + + cmake_src_configure +} + +src_install() { + if use doc ; then + mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die + fi + + cmake_src_install + + # Completions + dobashcomp completions/bash/qpdf + + insinto /usr/share/zsh/site-functions + doins completions/zsh/_qpdf +}
