From d37b97a25b8b10f748eead6574b01f893f140b01 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Dec 2017 18:23:20 +0000 Subject: gentoo resync : 06.12.2017 --- app-text/poppler/Manifest | 7 +- .../poppler/files/poppler-0.62.0-openjpeg2.patch | 14 +++ app-text/poppler/poppler-0.62.0.ebuild | 139 +++++++++++++++++++++ app-text/poppler/poppler-9999.ebuild | 11 +- 4 files changed, 160 insertions(+), 11 deletions(-) create mode 100644 app-text/poppler/files/poppler-0.62.0-openjpeg2.patch create mode 100644 app-text/poppler/poppler-0.62.0.ebuild (limited to 'app-text/poppler') diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index e8f8abc8340c..eaf3cbb08ee3 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -19,16 +19,19 @@ AUX poppler-0.59.0-respect-cflags.patch 2749 BLAKE2B 130566eaa2a4c87001f7cd94c72 AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c AUX poppler-0.60.1-respect-cflags.patch 2956 BLAKE2B cb773887a8288a8c55022c6338afa816a34e42ad65fe9bb645e82af12ca38c7c32ded29f8bd6a8c3ca9f503978653c9974b58159e226bec369ccfd345ecbee98 SHA512 905ba703b71f637946f5adae510034a47cdc6dadb987d3c50de12e6275b53cc7d3f91456a62b4af8ef096592fd19b611888c37c7867ec44cfd82d3b252a4ac43 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d +AUX poppler-0.62.0-openjpeg2.patch 599 BLAKE2B 6227946829d8b04d3c12505f5a9878d78f44925b405c2871c6b69a36b02ec8f411ff3cfe397870606be3d2af1cc5e14f23e42744810a095de8d3788092af3521 SHA512 35539dacc3e40b966c94ab73f3ae9228229472e3729f45844224d65ecc215480386e3e14cfb659a9de59277ca5928b81a9502cd48af91e7bb20e259bc5681170 DIST poppler-0.57.0.tar.xz 1703300 BLAKE2B e4126dff2e0ee140fa4c5c30d5a57da5aff38d4c1f566e4ace22d3fe625949db3a662a8513881702cd5c5c302845998dd462048b5158abaf1d119650c997c84c SHA512 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f DIST poppler-0.58.0.tar.xz 1710412 BLAKE2B ac2558503f86e8f0729d9ee5e4bc6c59dc9a4abca2e94b4e94b27b139dcb237b608af70b011b6f042a06d18ce83e32593f5b3d28876ee2606d7e63bc9230e51e SHA512 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee DIST poppler-0.59.0.tar.xz 1712004 SHA256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e WHIRLPOOL 82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2 DIST poppler-0.60.1.tar.xz 1432712 SHA256 19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc WHIRLPOOL fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7 -DIST poppler-0.61.1.tar.xz 1433696 SHA256 1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9 SHA512 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d WHIRLPOOL 9d41a9c2ae551f71a82cdae763a4d9c032977c1140fb89f619b912169f9c48c6b310bba38b0138de16c5af04cb46f0f58c57c60a15a648fefcd92cee8c8583df +DIST poppler-0.61.1.tar.xz 1433696 BLAKE2B 6749466223d3bb0e891c6b26c7f1faa5c774dd47ac94c22474efe4a52af228aeb2abbb8ab268667acaa83fb41293246266124a111740df764eeedbe229fa70aa SHA512 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d +DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706 EBUILD poppler-0.57.0-r1.ebuild 4350 BLAKE2B 6a2624bc539f1742206987224cd351f3eec5b4f7484a767c9065efec4f338189451f1fd242437d931a45ea088a474d1dc38e6506a422ba6da38a750b4de174ab SHA512 a1ceaedc5c6e48641e3f74f7f24cd93c62c0e2f34dcaf8016e1d572d93a5fe53ec5ff62215b8b9d7773cf1c1614f945852fecd61b0418a3e13d804c1e0b9f7fc EBUILD poppler-0.57.0.ebuild 3858 BLAKE2B c4e998308076d2458384d364e684e6cd73233b873e258e50ca907ddab0b63fb4baa840b6cba30efb57d32b39a3e342bf8f2f538e68320938facdfe8f12d36d74 SHA512 7ac898f6ae7e4535acd582966abf08ebad92d957257da548a0c330998d82a6f6e82b7e4990c6c333f2625f34b84ddc41a973af43e68da3d9d081c0243c3a21fe EBUILD poppler-0.58.0.ebuild 3866 BLAKE2B 6cc87db70c2d396a98ed240b96458be5172b8b5fdb70d5da903d89cc0611e9b9f683ddba219dc97c0c8eb4dd93ba0a1a43d81e7645348abcd6dd4e2dab5ba248 SHA512 bc922423d817ad927ec5c25ec8504c187fd88a634fe03cf7b92d9c75342db7c92f65a1d37dbb134876d73b3f5a6261adc87b31639f642bf634682472b2a85218 EBUILD poppler-0.59.0.ebuild 3866 BLAKE2B ef874dc127c9802e730a6b9136029461091b0a0b44d1b2105264fe452483a39c76c9f899abadbb7489a2b3a1634898c3a26f6f527a0ff181b80c58b7469f65ce SHA512 c888b97b35099c864d93f34cadec29db3d705648ecb36ec0d21622dbc58e2851eb59a0e32edf86f695b167ec9d89e008aaf4cc2ddfa1e5d702b79f635d667a70 EBUILD poppler-0.60.1.ebuild 3861 BLAKE2B fa45fb8b44eebdcfa1513923a86071766ee4e5864631e81127b87a81f3c47bb00ba88d1af4f1dcc1915b938b584d17c89544320a50d766033079a130645c18d3 SHA512 973c61d28678966e7e3282121d0edf27a94680710fafbe3eae8c8a20a2edad72621a4b1ed8831f22fb3c527d85b6f800edb9ec17847b252abdda6e33b88585bb EBUILD poppler-0.61.1.ebuild 3861 BLAKE2B 5c838ed916b99b742f9bf190542b65dbc66b0d28562b987c59d98aee4e11335a9b112ef02de4e6e5dd5de3da4807993d101c7b00458baf22199cea550e43f121 SHA512 d7af6d662e22060b2651625f99fb0245cfb5ab5fc4f575a79319c629fb7c29926119fccbfe967a5dfd5af9ad6e9ad797771777ef18a4226f0192acde51fa2787 -EBUILD poppler-9999.ebuild 3875 BLAKE2B 5e97bd3fdf70a68b3efde627e2789aaa0d5c2ef181722b793c330cc9579f848bd565e5097279786ce9785692123e0dd25a5f9986c63418eeb6cc7143e67913b9 SHA512 0605c6eef746d5851b21b4a9b6c7382bc3ddf3b0edc2725df608d34e00470dd92e7d7a79857915d4b990d2e8d11b37c2684b09ed8fa36ead918f6149b8473e59 +EBUILD poppler-0.62.0.ebuild 3720 BLAKE2B 3bc49036daf93925bd118ae1ca73141df014cbc54ee3f0252d56b1ca938020504cfc63dce090fdb0624ef488ecc02beb88f7fc832cff80e61b51715a2577831d SHA512 a522bca4b504bb620f925fe7f2678368c1d29ab4e9bf4f48712f116c3c43044d5611a1b36d002f5763450b5b19ea9b7795a0e437e9e7b1141ade7769e2ae701e +EBUILD poppler-9999.ebuild 3734 BLAKE2B 03dffe9f799bb1e9924eb4bb9706600a4453eebc0227697fae0d57f18aab14a2661be568f7f2d7e69a7f3e8c3be437de666d2c040515ecad98f951adbe22e669 SHA512 7eda31a630f84514751c332beb309b7da58c5611bc09a6228a9d53ea625baf471ae7e39534b765a00fc624d39109c36a2331636f3de4717156346fb9a9680eff MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa diff --git a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch new file mode 100644 index 000000000000..789090cc9b22 --- /dev/null +++ b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch @@ -0,0 +1,14 @@ +Sadly the CMake side of openjpeg slotting in Gentoo is broken. +To reliably find openjpeg:2 we need to use pkg-config. + +--- poppler-0.62.0/CMakeLists.txt ++++ poppler-0.62.0/CMakeLists.txt +@@ -193,7 +193,7 @@ + endif() + set(WITH_OPENJPEG FALSE) + if(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2") +- find_package(LIBOPENJPEG2) ++ pkg_check_modules(LIBOPENJPEG2 libopenjp2) + set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND}) + if(NOT LIBOPENJPEG2_FOUND) + message(FATAL_ERROR "Install libopenjpeg2 before trying to build poppler. You can also decide to use the internal unmaintained JPX decoder or none at all.") diff --git a/app-text/poppler/poppler-0.62.0.ebuild b/app-text/poppler/poppler-0.62.0.ebuild new file mode 100644 index 000000000000..317b923ddd99 --- /dev/null +++ b/app-text/poppler/poppler-0.62.0.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils toolchain-funcs xdg-utils + +if [[ "${PV}" == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" + 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-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SLOT="0/72" # 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" + +COMMON_DEPEND=" + >=media-libs/fontconfig-2.6.0 + >=media-libs/freetype-2.3.9 + sys-libs/zlib + cairo? ( + dev-libs/glib:2 + >=x11-libs/cairo-1.10.0 + introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) + ) + curl? ( net-misc/curl ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( media-libs/openjpeg: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 ) +" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig +" +RDEPEND="${COMMON_DEPEND} + cjk? ( >=app-text/poppler-data-0.4.7 ) +" + +DOCS=(AUTHORS NEWS README README-XPDF) + +PATCHES=( + "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch" + "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" + "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" + "${FILESDIR}/${PN}-0.62.0-openjpeg2.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 -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die + fi + + if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then + sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ + -i CMakeLists.txt || die + else + einfo "policy(SET CMP0002 OLD) - workaround can be removed" + fi + + if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then + # we need to up the C++ version, bug #622526 + export CXX="$(tc-getCXX) -std=c++11" + 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_XPDF_HEADERS=ON + -DENABLE_LIBCURL="$(usex curl)" + -DENABLE_CPP="$(usex cxx)" + -DENABLE_UTILS="$(usex utils)" + -DSPLASH_CMYK=OFF + -DUSE_FIXEDPOINT=OFF + -DUSE_FLOAT=OFF + -DWITH_Cairo="$(usex cairo)" + -DWITH_GObjectIntrospection="$(usex introspection)" + -DWITH_JPEG="$(usex jpeg)" + -DWITH_NSS3="$(usex nss)" + -DWITH_PNG="$(usex png)" + $(cmake-utils_use_find_package qt5 Qt5Core) + -DWITH_TIFF="$(usex tiff)" + ) + if use jpeg; then + mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg) + else + mycmakeargs+=(-DENABLE_DCTDECODER=none) + fi + if use jpeg2k; then + mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2) + else + mycmakeargs+=(-DENABLE_LIBOPENJPEG=none) + fi + if use lcms; then + mycmakeargs+=(-DENABLE_CMS=lcms2) + else + mycmakeargs+=(-DENABLE_CMS=) + fi + + 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 664f5ee424ab..3b1c4cfa08a2 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -19,7 +19,7 @@ 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 qt4 qt5 tiff +utils" +IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" # No test data provided RESTRICT="test" @@ -39,10 +39,6 @@ COMMON_DEPEND=" lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -63,8 +59,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch" "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" - "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" - "${FILESDIR}/${PN}-0.40-FindQt4.patch" + "${FILESDIR}/${PN}-0.62.0-openjpeg2.patch" ) src_prepare() { @@ -93,7 +88,6 @@ src_configure() { xdg_environment_reset local mycmakeargs=( -DBUILD_GTK_TESTS=OFF - -DBUILD_QT4_TESTS=OFF -DBUILD_QT5_TESTS=OFF -DBUILD_CPP_TESTS=OFF -DENABLE_SPLASH=ON @@ -111,7 +105,6 @@ src_configure() { -DWITH_JPEG="$(usex jpeg)" -DWITH_NSS3="$(usex nss)" -DWITH_PNG="$(usex png)" - -DWITH_Qt4="$(usex qt4)" $(cmake-utils_use_find_package qt5 Qt5Core) -DWITH_TIFF="$(usex tiff)" ) -- cgit v1.2.3