diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2017-11-13 11:22:55 +0100 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2017-11-13 11:23:17 +0100 |
commit | 131df8329e9b993921e5a1dd91988d41e4149d01 (patch) | |
tree | b3c0413d8b3c313da6218332dea5cd39126c9c25 /app-text | |
parent | app-text/poppler: Bump to version 0.61.1 (diff) | |
download | gentoo-131df8329e9b993921e5a1dd91988d41e4149d01.tar.gz gentoo-131df8329e9b993921e5a1dd91988d41e4149d01.tar.bz2 gentoo-131df8329e9b993921e5a1dd91988d41e4149d01.zip |
app-text/poppler: Removed old.
Package-Manager: Portage-2.3.13, Repoman-2.3.4
Diffstat (limited to 'app-text')
-rw-r--r-- | app-text/poppler/Manifest | 1 | ||||
-rw-r--r-- | app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch | 24 | ||||
-rw-r--r-- | app-text/poppler/poppler-0.61.0-r1.ebuild | 151 |
3 files changed, 0 insertions, 176 deletions
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index a4eae7e106a9..62a15b03bbd5 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -3,5 +3,4 @@ DIST poppler-0.57.0.tar.xz 1703300 SHA256 0ea37de71b7db78212ebc79df59f99b66409a2 DIST poppler-0.58.0.tar.xz 1710412 SHA256 0e42e46419ae54b02d9f2b527c6475b6011d15816918b9057dfa3aae211af832 SHA512 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee WHIRLPOOL 658f7dfbb786c2e09558f7e89ef0832db4ff32eaef08b7360fbf468236db01b44e33374424df6b64c17f018d7b10f61e151c08026652628d387958143a5a3837 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.0.tar.xz 1432952 SHA256 53cde17a2afa3b73eb8b209d24e4369b52bfac444065dbb0a8cbcc7356582b7f SHA512 d65a7ed87c8b87ee9a6b15ace90114c1538af29669a0bd6688895876f1fb726d38ddc4f686efdf5a33fc2a950cab10ca032dcd8f42ef5941b3b089239c6b11f5 WHIRLPOOL 56848f1248f42066c3fa76b617c9f24411209376fa088b39ee3a630ffb7a6368fa188050118f17b09af77a4ab6495e310edefc6c4f9dfd2082ef4d57eb902c0f DIST poppler-0.61.1.tar.xz 1433696 SHA256 1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9 SHA512 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d WHIRLPOOL 9d41a9c2ae551f71a82cdae763a4d9c032977c1140fb89f619b912169f9c48c6b310bba38b0138de16c5af04cb46f0f58c57c60a15a648fefcd92cee8c8583df diff --git a/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch b/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch deleted file mode 100644 index 906989aa8ba0..000000000000 --- a/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 950d19a00a454098831ca42ffbe0b61d323f0f89 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Tue, 7 Nov 2017 15:41:30 +0100 -Subject: [PATCH] poppler-qt5.pc.cmake: Fixed typo in libdir entry. - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - poppler-qt5.pc.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/poppler-qt5.pc.cmake b/poppler-qt5.pc.cmake -index aaa1aa77..7e8c5c8f 100644 ---- a/poppler-qt5.pc.cmake -+++ b/poppler-qt5.pc.cmake -@@ -1,5 +1,5 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --libdir=CMAKE_INSTALL_LIBDIR@ -+libdir=@CMAKE_INSTALL_LIBDIR@ - includedir=@CMAKE_INSTALL_INCLUDEDIR@ - - Name: poppler-qt5 --- -2.15.0 - diff --git a/app-text/poppler/poppler-0.61.0-r1.ebuild b/app-text/poppler/poppler-0.61.0-r1.ebuild deleted file mode 100644 index e1fa049c01c8..000000000000 --- a/app-text/poppler/poppler-0.61.0-r1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# 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 qt4 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= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - 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.33.0-openjpeg2.patch" - "${FILESDIR}/${PN}-0.40-FindQt4.patch" - "${FILESDIR}/${PN}-0.61.0-qt5_pc_in_typo.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_QT4_TESTS=OFF - -DBUILD_QT5_TESTS=OFF - -DBUILD_CPP_TESTS=OFF - -DCMAKE_INSTALL_DATADIR="/usr/share" - -DCMAKE_INSTALL_INCLUDEDIR="/usr/include" - -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)" - -DCMAKE_INSTALL_MANDIR="/usr/share/man" - -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)" - -DWITH_Qt4="$(usex qt4)" - $(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 -} |