diff options
Diffstat (limited to 'app-text/poppler')
-rw-r--r-- | app-text/poppler/Manifest | 10 | ||||
-rw-r--r-- | app-text/poppler/metadata.xml | 2 | ||||
-rw-r--r-- | app-text/poppler/poppler-0.79.0-r1.ebuild | 2 | ||||
-rw-r--r-- | app-text/poppler/poppler-0.80.0.ebuild | 2 | ||||
-rw-r--r-- | app-text/poppler/poppler-0.81.0.ebuild | 122 | ||||
-rw-r--r-- | app-text/poppler/poppler-9999.ebuild | 12 |
6 files changed, 15 insertions, 135 deletions
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index b0a655e4ddd6..d67c0c1a9d49 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -5,9 +5,7 @@ AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27 AUX poppler-0.78.0-respect-cflags.patch 1140 BLAKE2B 59e87b6957a5aff35cf6ebc8092c0552b8ece31e2fc73765789ac73dc5ac01ba69928f9308de9660ba3cf6b38b921ca341dcf6c5bce1d360b1bcf1a4005e4115 SHA512 713f7a3e3e2ae950fd6406ed076d4e6d2079619e40f00de7ec7d7df587df520373b923d343494902da454423adf29174f1ced11cb874a12851febfc1860988f4 DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9 DIST poppler-0.80.0.tar.xz 1548908 BLAKE2B 09a3b10b1ee6a9de900f7a6ca105e98ec266995c3f6a3d56fbefb7b57851462caa4a16a55081efd8b70d02107d8b7a13a74e316d448290bb3b02286c1778ad86 SHA512 0a0d68168ba4d560941de31cb9e32c6cd7b44025e93cd84ace863ffab5b9ff0356524626cb16fb99c29a897738f2ac5862480fc54d42f8aecd2e3457f11c642f -DIST poppler-0.81.0.tar.xz 1548944 BLAKE2B 23b460d50b22d8b42690c28156398fa3cf299ac24ea883dc8c79044c44aebc126388cab2f31e69c76c50750ef86bd5203958efbb1c353c582c0337e6e0486a85 SHA512 774d650c63afe2a0d6669daad4b286c2412a0c02581d7ea2cc37d71936f77dff92dc22217367561b7e4285c9c27dcfdca4c76c187d9c3c482db2f3549919b25b -EBUILD poppler-0.79.0-r1.ebuild 3496 BLAKE2B 71c664164c00a554aa7e524b8e56e32d5d6e05ff68ec88bb4ca45e474cde45b20b653d101c8cafa5467875c1a31ca8184ec956efa278f07e762c2b74a3569449 SHA512 91aad9e8ef1648b5207cf9e20ef6a6475305a39b375109196fcbaed1078ca6fac67f5c70e0ca89668a8d46d9e7d234a39b48d6e5c83b6a4900804393e68ec9fa -EBUILD poppler-0.80.0.ebuild 3484 BLAKE2B 607e91146b25a87bb690b869d1310c2b7a536912ecb70159bb0087fa6c31c4aa65ee773b3e5254d051e606fc9ca946a32eb48d34869bb5382a598083eade11e4 SHA512 1415779bc776554445fa049ec35a0ba68e9b7ed878da9b0170a3acd1ef575d2b72f62eca14e2ada250b5ceeac5ce7a6491120249c2080034c2afcd6ecedba49b -EBUILD poppler-0.81.0.ebuild 3367 BLAKE2B 88eefb38717a40ea3adde8c8ddf5189e80a04f48500886470ebe7a7702eb24afb567a041490186765f27cb6978ef866285b64704e7bbe61560bc7578a1383382 SHA512 780f3b1116d35a3a51d5de2d43690580e554814ad1d9f07f2ab54006561fabebe053be42591d07e608fee0de1b3b453fb865ecb056708beb59e013a2ed059e17 -EBUILD poppler-9999.ebuild 3367 BLAKE2B 88eefb38717a40ea3adde8c8ddf5189e80a04f48500886470ebe7a7702eb24afb567a041490186765f27cb6978ef866285b64704e7bbe61560bc7578a1383382 SHA512 780f3b1116d35a3a51d5de2d43690580e554814ad1d9f07f2ab54006561fabebe053be42591d07e608fee0de1b3b453fb865ecb056708beb59e013a2ed059e17 -MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c +EBUILD poppler-0.79.0-r1.ebuild 3518 BLAKE2B b1788df48fbc4300fc64ba2ab94bec0f1fd6fcce577ed5180fe2508043834c1894fef44096bb5d30697df5215999ec871798df1d7e936a82f604bbfe46fedece SHA512 9e04527cbacec01d734b737f9ebaa729300c987198a53c69079c198d9ace244f81eb1b6e516ad81e8afaca1ff6d44d8de3df92afc22a684fc6f389de37e5f0de +EBUILD poppler-0.80.0.ebuild 3506 BLAKE2B ba82b892b343c3acf9029f0cdfe8f6fafa5b25f896a802b214373082295282e577f19ed3eea5a0e55d9fb23cb1a36b09e91b84d9b4e3cb65008858a34c9bec9b SHA512 bdc23a2cd987ae8f0fee3d80931b7f7e9c0a705acb58ea5eadc16c7ebf1276b9b0880130743b4c6e29b8b0acf7c442183a41a45fd626ff8830d9af7c5df5bd48 +EBUILD poppler-9999.ebuild 3506 BLAKE2B ba82b892b343c3acf9029f0cdfe8f6fafa5b25f896a802b214373082295282e577f19ed3eea5a0e55d9fb23cb1a36b09e91b84d9b4e3cb65008858a34c9bec9b SHA512 bdc23a2cd987ae8f0fee3d80931b7f7e9c0a705acb58ea5eadc16c7ebf1276b9b0880130743b4c6e29b8b0acf7c442183a41a45fd626ff8830d9af7c5df5bd48 +MISC metadata.xml 995 BLAKE2B 41ffeea7d766a1d5c86020673522c94ebb243b75e21b761f8c202bea7789464d2e3097a74f6ff6ee42f41ce34221ed378b6fcd6912f472249aa9e5ff01721346 SHA512 9d9134ae26b37d2d3a1859cc4d8c67a02257f7cfa33c5863260f8ec8afcde28f7430fcec557e6a5cb1c9d03cb0b5c116c074ba4034f94fa0ece4e957f718d319 diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml index 6f044d376b2f..e88e31fc283b 100644 --- a/app-text/poppler/metadata.xml +++ b/app-text/poppler/metadata.xml @@ -26,6 +26,6 @@ </use> <slots> <subslots>Reflects ABI compatibility of libpoppler.so only, - NOT libpoppler-{glib,qt5,cpp}.so!</subslots> + NOT libpoppler-{glib,qt4,cpp}.so!</subslots> </slots> </pkgmetadata> diff --git a/app-text/poppler/poppler-0.79.0-r1.ebuild b/app-text/poppler/poppler-0.79.0-r1.ebuild index 7043b939f9bb..caa27e2a577d 100644 --- a/app-text/poppler/poppler-0.79.0-r1.ebuild +++ b/app-text/poppler/poppler-0.79.0-r1.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SLOT="0/89" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi diff --git a/app-text/poppler/poppler-0.80.0.ebuild b/app-text/poppler/poppler-0.80.0.ebuild index c2f563333cc2..e11942716aad 100644 --- a/app-text/poppler/poppler-0.80.0.ebuild +++ b/app-text/poppler/poppler-0.80.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SLOT="0/90" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi diff --git a/app-text/poppler/poppler-0.81.0.ebuild b/app-text/poppler/poppler-0.81.0.ebuild deleted file mode 100644 index 86a7cd33bcc2..000000000000 --- a/app-text/poppler/poppler-0.81.0.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 2005-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils 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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/91" # 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="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" - -# No test data provided -RESTRICT="test" - -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig -" -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 ) -" - -DOCS=( AUTHORS NEWS README.md README-XPDF ) - -PATCHES=( - "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch" - "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" - "${FILESDIR}/${PN}-0.78.0-respect-cflags.patch" - "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" - "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" -) - -src_prepare() { - cmake-utils_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 [[ ${CC} == 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 - -DENABLE_SPLASH=ON - -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-utils_use_find_package qt5 Qt5Core) - -DWITH_TIFF=$(usex tiff) - -DENABLE_UTILS=$(usex utils) - ) - use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_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 86a7cd33bcc2..e11942716aad 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 2005-2019 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils toolchain-funcs xdg-utils +inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils if [[ ${PV} == *9999* ]] ; then inherit git-r3 @@ -11,8 +11,8 @@ 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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/91" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SLOT="0/90" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" @@ -79,6 +79,9 @@ src_prepare() { else einfo "policy(SET CMP0002 OLD) - workaround can be removed" fi + + # we need to up the C++ version, bug #622526, #643278 + append-cxxflags -std=c++11 } src_configure() { @@ -91,6 +94,7 @@ src_configure() { -DENABLE_ZLIB=ON -DENABLE_ZLIB_UNCOMPRESS=OFF -DENABLE_UNSTABLE_API_ABI_HEADERS=ON + -DSPLASH_CMYK=OFF -DUSE_FLOAT=OFF -DWITH_Cairo=$(usex cairo) -DENABLE_LIBCURL=$(usex curl) |