From edb70f8d8529c7ff7fe2e642ebb24f7a65bf8678 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 10 Aug 2025 14:57:28 +0200 Subject: [PATCH] app-text/poppler: 25.08.0 version bump, subslot bump Signed-off-by: Andreas Sturmlechner --- app-text/poppler/Manifest | 2 + app-text/poppler/poppler-25.08.0.ebuild | 150 ++++++++++++++++++++++++ app-text/poppler/poppler-9999.ebuild | 2 +- 3 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 app-text/poppler/poppler-25.08.0.ebuild diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 0bb9bbf48d719..d88cef12a94ec 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -2,5 +2,7 @@ DIST poppler-25.06.0.tar.xz 1967376 BLAKE2B 4a774520de8f87d1520dd4540214faae8853 DIST poppler-25.06.0.tar.xz.sig 833 BLAKE2B 0d1f0bdd6f57374b9ee04bd69daf85360b745598e190be00484c50483321eab69156bb590b76991fd9f81898026cdf63e0303e49fd634d9ae63812e595c6b6db SHA512 dc2151ee5b66f189a9e32191efa886f0ead6f5b025522210cccd49abead7f06df3248400ce21679bade9c9b3ac7f1071cddd9a82a4ac84eb875765736afa1bdf DIST poppler-25.07.0.tar.xz 1971768 BLAKE2B 462e8ca8937636b50041260eb642742a1444f683abe20f5e7c15bbe3432b5d26f3e0c504d58124d5e6901dc2c347baa8f4d57045b6f40756b5d1c94beb5e4e74 SHA512 761e770f975da5a12e217b57829aff0b0b8fd3fed640f7af71da8acdaa5ba292492258b7ce0f01b023e5fb8e37b94f353cb2b68af5a22392c456106d76e03baa DIST poppler-25.07.0.tar.xz.sig 833 BLAKE2B 5d36c619e79a0ab346058f18d331260d6b410e0a590d9001fda98ecbf301277285e6743e1ead226a742c39d199259bce91083e8e73f1186f4a365b6c34e4a923 SHA512 263f0cc74467e917692cc5cc9cfc2088192f45e613acc3c213f1b68e7c366d73f95a411b24a64438425aefbfea5712df470fed415bc73e6fba550137af093283 +DIST poppler-25.08.0.tar.xz 1975316 BLAKE2B d7bba8116ed995e1618b15f60bce25d347f4468cd618062fef63f6c90e76ee998907f6ac111a3e9759b9a6f281a46d6c9fab11bbf3174e45cdf862d6e631f145 SHA512 ebefb6952bbec3356bbe1e43562203fc4446065ff289bc181ecc6f5a11901b7cc002ce1b0746487bb5b52535df0f0b77866ea427b244df1ba6d87bffce555999 +DIST poppler-25.08.0.tar.xz.sig 833 BLAKE2B 4ec4dd143fd8621248926f5e20342f1f06467b297155be4a8fc4f9ab082d904162dbf752a55a20c69e5fe141cb19ca0875962c65cba9190878c202443011a383 SHA512 d440297cea6899681fa6dfd93f72f8ade0dab1b3c3126e817b886f0481fb5971e01cea0b0221c8e24e6f1cd675c8a937011de70741ef80af902223a063f69334 DIST poppler-test-8ad36fac5cbbf54fccedf02e5d4f7a662b7cc1cb.tar.bz2 5288238 BLAKE2B 6b23f1b4bb9ec5ccb32beee53ab1b9864bdc61f624ec63cfd04c860fc19865566070e289a97b6376a622c27ef4a2c1a45e0c2393872ee9cc60436d250a83e2da SHA512 231d2a05a2dd25115186221d82bf5169db8f87499e64163bfa23ba2f14337769a7bd7d3fd46ca45ed6dc749a521dabbe7bce14bef8ce69f58c93dec4d3796b81 DIST poppler-test-c79c6839e859dbee6b73ac260788fa2de8618ba4.tar.bz2 5388727 BLAKE2B 31f144b1be1c17a3feb02c77fe8e8b628a995fe3f0c5734eb7f10264f4f49ccd79a3633b260065fec6b02a5ed7361a11965be1dc401ed27c19d8acfcc8268796 SHA512 6305f194a0f43f54a4b4c2641f756255e7cac72d85b476350b5d520ccb868e8e1775032cb8dc1b2d784f6e2e80ce47b0ae0f69bb46a426c76d84a48020265ad8 diff --git a/app-text/poppler/poppler-25.08.0.ebuild b/app-text/poppler/poppler-25.08.0.ebuild new file mode 100644 index 0000000000000..087db6fe0fa11 --- /dev/null +++ b/app-text/poppler/poppler-25.08.0.ebuild @@ -0,0 +1,150 @@ +# Copyright 2005-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic toolchain-funcs xdg-utils + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.freedesktop.org/poppler/poppler" + SLOT="0/9999" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc + inherit verify-sig + + TEST_COMMIT="c79c6839e859dbee6b73ac260788fa2de8618ba4" + SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" + SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )" + SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + SLOT="0/152" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION +fi + +DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" +HOMEPAGE="https://poppler.freedesktop.org/" + +LICENSE="GPL-2" +IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + >=media-libs/fontconfig-2.13 + >=media-libs/freetype-2.10 + sys-libs/zlib + cairo? ( + >=dev-libs/glib-2.64:2 + >=x11-libs/cairo-1.16 + introspection? ( >=dev-libs/gobject-introspection-1.72:= ) + ) + curl? ( net-misc/curl ) + gpgme? ( dev-cpp/gpgmepp:= ) + jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) + lcms? ( media-libs/lcms:2 ) + nss? ( >=dev-libs/nss-3.49 ) + png? ( media-libs/libpng:0= ) + qt5? ( + >=dev-qt/qtcore-5.15.2:5 + >=dev-qt/qtgui-5.15.2:5 + >=dev-qt/qtxml-5.15.2:5 + ) + qt6? ( dev-qt/qtbase:6[gui,xml] ) + tiff? ( media-libs/tiff:= ) +" +RDEPEND="${COMMON_DEPEND} + cjk? ( app-text/poppler-data ) +" +DEPEND="${COMMON_DEPEND} + boost? ( >=dev-libs/boost-1.74 ) + test? ( + qt5? ( + >=dev-qt/qttest-5.15.2:5 + >=dev-qt/qtwidgets-5.15.2:5 + ) + qt6? ( dev-qt/qtbase:6[widgets] ) + ) +" +BDEPEND=" + >=dev-util/glib-utils-2.64 + virtual/pkgconfig +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )" +fi + +DOCS=( AUTHORS NEWS README.md README-XPDF ) + +PATCHES=( + "${FILESDIR}/${PN}-23.10.0-qt-deps.patch" + "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch" + "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" +) + +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} + fi + + default +} + +src_prepare() { + cmake_src_prepare + + # Clang doesn't grok this flag, the configure nicely tests that, but + # cmake just uses it, so remove it if we use clang + if tc-is-clang ; then + sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die + fi +} + +src_configure() { + xdg_environment_reset + append-lfs-flags # bug #898506 + + local mycmakeargs=( + -DBUILD_GTK_TESTS=OFF + -DBUILD_QT5_TESTS=$(usex test $(usex qt5)) + -DBUILD_QT6_TESTS=$(usex test $(usex qt6)) + -DBUILD_CPP_TESTS=$(usex test) + -DBUILD_MANUAL_TESTS=$(usex test) + -DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT} + -DRUN_GPERF_IF_PRESENT=OFF + -DENABLE_BOOST="$(usex boost)" + -DENABLE_ZLIB_UNCOMPRESS=OFF + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON + -DUSE_FLOAT=OFF + -DWITH_Cairo=$(usex cairo) + -DENABLE_LIBCURL=$(usex curl) + -DENABLE_CPP=$(usex cxx) + -DENABLE_GPGME=$(usex gpgme) + -DWITH_JPEG=$(usex jpeg) + -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) + -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) + -DENABLE_LCMS=$(usex lcms) + -DENABLE_NSS3=$(usex nss) + -DWITH_PNG=$(usex png) + -DENABLE_QT5=$(usex qt5) + -DENABLE_QT6=$(usex qt6) + -DENABLE_LIBTIFF=$(usex tiff) + -DENABLE_UTILS=$(usex utils) + ) + use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # live version doesn't provide html documentation + if use cairo && use doc && [[ ${PV} != *9999* ]]; then + # For now install gtk-doc there + insinto /usr/share/gtk-doc/html/poppler + doins -r "${S}"/glib/reference/html/* + fi +} diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild index 8558173768642..087db6fe0fa11 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -18,7 +18,7 @@ else SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )" SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - SLOT="0/151" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + SLOT="0/152" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"