commit: c857360448472826b901730c62718a1734096968 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Mar 24 15:50:20 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Mar 24 18:03:36 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8573604
app-text/poppler: drop 24.11.0-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-text/poppler/Manifest | 2 - .../files/poppler-24.11.0-readd-SplashFont.patch | 25 ---- .../poppler-24.11.0-readd-StructTreeRoot.patch | 25 ---- .../poppler-24.11.0-readd-ViewerPreferences.patch | 25 ---- app-text/poppler/poppler-24.11.0-r1.ebuild | 161 --------------------- 5 files changed, 238 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 0215b5740566..a03f2d0dcd26 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,5 +1,3 @@ -DIST poppler-24.11.0.tar.xz 1922804 BLAKE2B 2ee77ddfd49ab4b3f486fcd160be21fdf2d474e44b6cdfd40a7f927cbe253d407a6f75b66de83ab541288a54558445e409b283a81c7a8ff20f9a6d0d4f33adf7 SHA512 3823c024d9b1cab7c4ee8a99d5209722296cce8894e3f4ba8d5a84ab6bba430fa0c1078bfcddcdbc1c30bd98832e269df2aef1d5af20c1985b9f903cb70a24e7 -DIST poppler-24.11.0.tar.xz.sig 833 BLAKE2B 7ef6e5bd5659c91dc5924367b7875a3946116a71b0cc02d98a1cccd51d4a46b8d8b219681e576ba7ea27f736c8a5220ae98acb0f454ac4785c03d1c66d104046 SHA512 7b935eaa99c4c3e8706bfcb010245babf5a4f08f6809a340239a0c40eed0a79472c34e4722d4b480e20fa6618106cc5e9583e209e025689f1fae06c5c499f95f DIST poppler-25.02.0.tar.xz 1943728 BLAKE2B 4d58a6b4dbef0f45119ce9c18ebc9838cf65a18cb41fd08bbcbb9adb4d06adbb81c1fb50255cc6d96e5504a54e6756b6b6efb4bc7d34d19d47fb0089f8673d3f SHA512 5223dd2c6f4014b40da989d9a09cea7e8ae5441b4c511c89aab731abed6b72c817633addd591da34743f86cb81b0e147df05ac99ada2e3d2a13d287abef5c4a0 DIST poppler-25.02.0.tar.xz.sig 833 BLAKE2B 93a2443590ed97e09bced44a0b3aeff4dbcf74358923527bef8effcb09c14a0ac14e45aef7c76d929bb7b966b8aaf7417c551911f789ecf888f9bb04d9405c10 SHA512 6d723138c87a753d8d65e28f803fa6a75dbeb4f7e0510155f910e7d76c87e2b70554010214e7d125c1b619a672b251428de81bdde49ab682c5117eb1ff4847d2 DIST poppler-25.03.0.tar.xz 1954516 BLAKE2B 369d3f60ee50c3ca01df0ea9aab5b5081318b484ffc4862153c274a489afd14f6fc0c470712c1a6c25edf49952ecd07b3a490c5ea10e1b0116fba2e6d9b1788e SHA512 8b550774389688850ff0629de2fbd5b33193076075d5da116151be3340066b0bbf5cd9b86c79949c28b8e670998e30760d5126164b4681f89322cbe8eeeb2172 diff --git a/app-text/poppler/files/poppler-24.11.0-readd-SplashFont.patch b/app-text/poppler/files/poppler-24.11.0-readd-SplashFont.patch deleted file mode 100644 index 35daf33c7c6f..000000000000 --- a/app-text/poppler/files/poppler-24.11.0-readd-SplashFont.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6a87cf2157e6ce5b1f98288727e8fc2a2caf0220 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <[email protected]> -Date: Wed, 13 Nov 2024 21:15:55 +0100 -Subject: [PATCH] Install SplashFont again - -I failed realizing it was usable ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a5c8b7610..ef0dc236a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -756,6 +756,7 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS) - splash/SplashBitmap.h - splash/SplashClip.h - splash/SplashErrorCodes.h -+ splash/SplashFont.h - splash/SplashFontEngine.h - splash/SplashFontFile.h - splash/SplashFontFileID.h --- -GitLab - diff --git a/app-text/poppler/files/poppler-24.11.0-readd-StructTreeRoot.patch b/app-text/poppler/files/poppler-24.11.0-readd-StructTreeRoot.patch deleted file mode 100644 index 9b0a5211abd0..000000000000 --- a/app-text/poppler/files/poppler-24.11.0-readd-StructTreeRoot.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2d7188a3a3679a359e3eb49beb9657027a16b3bd Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <[email protected]> -Date: Wed, 13 Nov 2024 22:06:46 +0100 -Subject: [PATCH] Install StructTreeRoot.h again - -I didn't realize it was usable without being exported ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ef0dc236a..574b50deb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -713,6 +713,7 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS) - poppler/Stream-CCITT.h - poppler/Stream.h - poppler/StructElement.h -+ poppler/StructTreeRoot.h - poppler/UnicodeMap.h - poppler/UnicodeMapFuncs.h - poppler/UnicodeMapTables.h --- -GitLab - diff --git a/app-text/poppler/files/poppler-24.11.0-readd-ViewerPreferences.patch b/app-text/poppler/files/poppler-24.11.0-readd-ViewerPreferences.patch deleted file mode 100644 index 9787e6f3a80d..000000000000 --- a/app-text/poppler/files/poppler-24.11.0-readd-ViewerPreferences.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b9620f70a41e878b7f4e615ced4bd7ecf9fe7233 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <[email protected]> -Date: Sun, 10 Nov 2024 23:47:18 +0100 -Subject: [PATCH] Install ViewerPreferences again - -I failed realizing it was usable given it's all inline functions ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bb1c73a05..a5c8b7610 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -720,6 +720,7 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS) - poppler/UnicodeCClassTables.h - poppler/UnicodeCompTables.h - poppler/UnicodeDecompTables.h -+ poppler/ViewerPreferences.h - poppler/XRef.h - poppler/CharTypes.h - poppler/ErrorCodes.h --- -GitLab - diff --git a/app-text/poppler/poppler-24.11.0-r1.ebuild b/app-text/poppler/poppler-24.11.0-r1.ebuild deleted file mode 100644 index a387463f5a98..000000000000 --- a/app-text/poppler/poppler-24.11.0-r1.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 2005-2024 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="ff3133cdb6cb496ee1d2c3231bfa35006a5e8410" - 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/143" # 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? ( >=app-crypt/gpgme-1.19.0:=[cxx] ) - 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" - # git master - "${FILESDIR}/${P}-readd-ViewerPreferences.patch" - "${FILESDIR}/${P}-readd-SplashFont.patch" - "${FILESDIR}/${P}-readd-StructTreeRoot.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 - - if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then - sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ - -i CMakeLists.txt || die - else - einfo "policy(SET CMP0002 OLD) - workaround can be removed" - 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 -}
