From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- app-text/poppler/Manifest | 9 ++- app-text/poppler/poppler-22.03.0.ebuild | 126 ------------------------------ app-text/poppler/poppler-22.05.0.ebuild | 2 +- app-text/poppler/poppler-22.06.0.ebuild | 134 ++++++++++++++++++++++++++++++++ app-text/poppler/poppler-9999.ebuild | 12 ++- 5 files changed, 150 insertions(+), 133 deletions(-) delete mode 100644 app-text/poppler/poppler-22.03.0.ebuild create mode 100644 app-text/poppler/poppler-22.06.0.ebuild (limited to 'app-text/poppler') diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 67ac472b3edd..a5ea3b940d44 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -2,9 +2,10 @@ AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537 AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956 AUX poppler-22.05.0-missing-include.patch 518 BLAKE2B 7ade72f27a3d0b9fd32fb83113b71e74a0cb6dad42c6c79648edd7fffbe4c20fb716e3fb87e4e130620c63e7b5326a9d76ee24feaf074bd0ffef4f9007d89ea0 SHA512 d6a0d5f466f3af935bcf78b6f87f3b078076dbf7da9c3c7296f9731e14a197e7bf87057fb4dfbf1746790d9e02e485d762595dab70ad78b4ecf6e5913dc8b2db -DIST poppler-22.03.0.tar.xz 1809940 BLAKE2B 0307e9225645b289105fe5a55a712ab821a0961a5dd53467b7db41432d74ec763e9ab0494f6b4d1bed94f7b0c2a74cb849878ad5f0c877fa4df0888f97a10ef6 SHA512 f87bbff4f394f192095da0c00bdf8b5c70b7eb864941225aad2025e91283c3c42a0016a772e7e9ea73a86746251928fc64500f923e8fd841adae1c6e67d72569 DIST poppler-22.05.0.tar.xz 1828628 BLAKE2B d1757893c841d35cbdeda493afea92046c447dfa0d519ab9a872a75fdb7edbb06bbde78b2e7d41757f5bbff8d1f46c81f7314dff8386d4d686ded4d2cc85d65e SHA512 629098793050f7a901c2a2cf1efcad83c58d26164cf94f4aa3985465f016a8875c62be4fb8ab8005ca00ef061402962e6d6c14eb611ce29f2d71d3ae83f24737 -EBUILD poppler-22.03.0.ebuild 3330 BLAKE2B 37880159ec5f793338c8449151889c386058580ac92251ec3394db60128413d173d072e86859c8d8737d36e2c49c62981a5ce923263dccea48ad434961beb3ec SHA512 c2b911637f3a267838bf7a5b106d15c444711d279cd2f1725580748a18764540afa4a3670176845a8eb795c32f7be5ad106e13e7663876a4fb5cb420fe723097 -EBUILD poppler-22.05.0.ebuild 3398 BLAKE2B 81cffac734d2445079c70c9d4e28b68bf87aa9d4def2f31b94facc4cd1fbba54d16edf4c9db48adecb694148ec34993a2a7ca135ec05813bc2df31302faaa468 SHA512 19db76a558bfcac69b041e41c09bcdc39ec7a4af28190796caa4dd1d19fd2defb1a90d8d06f3638839bc56364e2a44156d13ddb0a17e1f184be147d8b8cabd34 -EBUILD poppler-9999.ebuild 3356 BLAKE2B 6cb589dfe9159ae555bc837794751f6ba3fea2ecdfd860e31aaf50f44311cb343b7f7c1cd9dc5166916cd019b17402772834e167e1bac24217a8b95ed90232f1 SHA512 77dcccb818580ef0baea683be7bfe01ba6445463384b517c182e353ab8fc29dc048ef728de62bc187cc81b17fbc7f66a90f44a0b23be5f868024aedc187db8a3 +DIST poppler-22.06.0.tar.xz 1834980 BLAKE2B 6988480dc30f5fe67be0170f8f006bdb4d3e6b0e0ad8643aa6cbf4fe017d52d8747f108267a30aee5ec4567aa5d2fcc9ce9824fc4dac45a1d37291fa668c2dfe SHA512 79e1a1440a0903ea6238dcc7afc4ecdf1f8cc53af94ec5649f631fca568711d48a7ec4046fccb8520818420dc21e4ad1aaf602c22b13f9ce22f4d06edc83c8a3 +DIST poppler-22.06.0.tar.xz.sig 833 BLAKE2B e2a842fac83b5c42713aa45072d8ea1de5219cbbc35d04142a902f569fc7c558cbda9a2379fde6f9f933b701fabe98f93de71a0676837b2a21104f919a097bc8 SHA512 b61f706e52c57209bb180fbe5a65e366e2a841743ac2c24fc0828dc4bab8ae52da12330e4694e8dade1e1963112fc7b01c0c1b30141be2b7c8c0cf2aaab059c5 +EBUILD poppler-22.05.0.ebuild 3397 BLAKE2B 69946eb58b8b7844de29734e327cdc8c912fa535c3281f908739e68901fc99ac6ca92c437f771bc3e328fcd48fb76b522146941f76df9fe414fc8305d8b23c86 SHA512 e1130a9e67d32e1fe3052c8fa9dd0f43c96024c69cb6ec44c8a103c8fcd8b98d7e29e7f2ecf05384f6bf582f0efd8757d04801024ec8d284f752c5f1b0d873b8 +EBUILD poppler-22.06.0.ebuild 3627 BLAKE2B bb1ec0745496495ef86d376d2d1ca6982a5a5f94a7976fbf7c62305e0e02dfcaa2ca56c6f615e10607379ca28b2779ec0405202232257cf637519707691159dc SHA512 39d1d7e26eac8e3bd11e089d5ff44ad7ac0d39ec2f0245e831b59cb8a34c9d533ff25ea343aaf3ddb83ed867b6f5218897540ddc943d3df7341ca539940c6da6 +EBUILD poppler-9999.ebuild 3628 BLAKE2B be29c55201cdf0c4e31a77538984b0057722b464f548903dd07ff898b9276c4338f0a27d98c8f9ff825f6c07f1fc4a62b761f38ace0a5a3eb6ce5db477744d88 SHA512 f8b03fd6a733bfde1faf5bb8327d952ef8134bf773c1b9d7034b06d88b8f02da247510c84e087fb776701c4e6729b7767b30264b0e5227a785a7563db94f3148 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6 diff --git a/app-text/poppler/poppler-22.03.0.ebuild b/app-text/poppler/poppler-22.03.0.ebuild deleted file mode 100644 index f6a73f037df2..000000000000 --- a/app-text/poppler/poppler-22.03.0.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 2005-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs xdg-utils - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" - SLOT="0/9999" -else - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/119" # 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 +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" - -# No test data provided -RESTRICT="test" - -DEPEND=" - media-libs/fontconfig - media-libs/freetype - sys-libs/zlib - cairo? ( - dev-libs/glib:2 - x11-libs/cairo - introspection? ( dev-libs/gobject-introspection:= ) - ) - curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) - lcms? ( media-libs/lcms:2 ) - nss? ( >=dev-libs/nss-3.19:0 ) - png? ( media-libs/libpng:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtxml:5 - ) - tiff? ( media-libs/tiff:0 ) -" -RDEPEND="${DEPEND} - cjk? ( app-text/poppler-data ) -" -DEPEND+=" - boost? ( dev-libs/boost ) -" -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig -" - -DOCS=( AUTHORS NEWS README.md README-XPDF ) - -PATCHES=( - "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" - "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch" - "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" -) - -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 - local mycmakeargs=( - -DBUILD_GTK_TESTS=OFF - -DBUILD_QT5_TESTS=OFF - -DBUILD_CPP_TESTS=OFF - -DBUILD_MANUAL_TESTS=OFF - -DRUN_GPERF_IF_PRESENT=OFF - -DENABLE_BOOST="$(usex boost)" - -DENABLE_ZLIB=ON - -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) - -DWITH_JPEG=$(usex jpeg) - -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) - -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) - -DENABLE_CMS=$(usex lcms lcms2 none) - -DWITH_NSS3=$(usex nss) - -DWITH_PNG=$(usex png) - $(cmake_use_find_package qt5 Qt5Core) - -DWITH_TIFF=$(usex tiff) - -DENABLE_UTILS=$(usex utils) - -DENABLE_QT6=OFF - ) - 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-22.05.0.ebuild b/app-text/poppler/poppler-22.05.0.ebuild index 4f4a7d09522e..6bd8c9f87f88 100644 --- a/app-text/poppler/poppler-22.05.0.ebuild +++ b/app-text/poppler/poppler-22.05.0.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then SLOT="0/9999" else SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SLOT="0/121" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi diff --git a/app-text/poppler/poppler-22.06.0.ebuild b/app-text/poppler/poppler-22.06.0.ebuild new file mode 100644 index 000000000000..b7d83c0dd31b --- /dev/null +++ b/app-text/poppler/poppler-22.06.0.ebuild @@ -0,0 +1,134 @@ +# Copyright 2005-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs xdg-utils + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" + SLOT="0/9999" +else + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc + inherit verify-sig + + SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" + SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SLOT="0/122" # 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 +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" + +# No test data provided +RESTRICT="test" + +DEPEND=" + media-libs/fontconfig + >=media-libs/freetype-2.8 + sys-libs/zlib + cairo? ( + dev-libs/glib:2 + x11-libs/cairo + introspection? ( dev-libs/gobject-introspection:= ) + ) + curl? ( net-misc/curl ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) + lcms? ( media-libs/lcms:2 ) + nss? ( >=dev-libs/nss-3.19:0 ) + png? ( media-libs/libpng:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtxml:5 + ) + tiff? ( media-libs/tiff:0 ) +" +RDEPEND="${DEPEND} + cjk? ( app-text/poppler-data ) +" +DEPEND+=" + boost? ( dev-libs/boost ) +" +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )" +fi + +DOCS=( AUTHORS NEWS README.md README-XPDF ) + +PATCHES=( + "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" + "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch" + "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" +) + +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 + local mycmakeargs=( + -DBUILD_GTK_TESTS=OFF + -DBUILD_QT5_TESTS=OFF + -DBUILD_CPP_TESTS=OFF + -DBUILD_MANUAL_TESTS=OFF + -DRUN_GPERF_IF_PRESENT=OFF + -DENABLE_BOOST="$(usex boost)" + -DENABLE_ZLIB=ON + -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) + -DWITH_JPEG=$(usex jpeg) + -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) + -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) + -DENABLE_CMS=$(usex lcms lcms2 none) + -DWITH_NSS3=$(usex nss) + -DWITH_PNG=$(usex png) + $(cmake_use_find_package qt5 Qt5Core) + -DWITH_TIFF=$(usex tiff) + -DENABLE_UTILS=$(usex utils) + -DENABLE_QT6=OFF + ) + 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 0f25d94a5279..1e336c95ce57 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -10,9 +10,13 @@ if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" SLOT="0/9999" else + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc + inherit verify-sig + SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/121" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )" + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SLOT="0/122" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" @@ -57,6 +61,10 @@ BDEPEND=" virtual/pkgconfig " +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )" +fi + DOCS=( AUTHORS NEWS README.md README-XPDF ) PATCHES=( -- cgit v1.2.3