commit: 72284d38f787b80f769fc63484ee8a9c70bd47d6 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Wed Dec 21 17:06:58 2016 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Wed Dec 21 17:09:48 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72284d38
app-text/poppler: Remove 0.46.0 (r1) Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-text/poppler/Manifest | 1 - .../poppler/files/poppler-0.46.0-crashfix-1.patch | 36 ----- .../poppler/files/poppler-0.46.0-crashfix-2.patch | 41 ------ app-text/poppler/poppler-0.46.0-r1.ebuild | 145 --------------------- 4 files changed, 223 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index d7a0818..00bc13a 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,6 +1,5 @@ DIST poppler-0.42.0.tar.xz 1674024 SHA256 9fef076ffe2a4f18a4e0da547d814ef5c5e6f8a283afe3387504a0bb1a418010 SHA512 ab8c86c28a2ac848bf118de7f20f57576ed4faa4ad06ae7d58590b951fb2b0ee8a728919ce2417592b467af7322c57ed0bff0288eced042fcf94a50d89c73c19 WHIRLPOOL 095986b44875847d471ecda35194eeb894051b689a754dc8ae55caa04100b4e2ebd57fe868008972502d27346eeb98699fa9660b414ececef4d0eafe53265736 DIST poppler-0.45.0.tar.xz 1674464 SHA256 96dd1a6024bcdaa4530a3b49687db3d5c24ddfd072ccb37c6de0e42599728798 SHA512 b703bed35da3572801834740bf61d59b6a3ee3b88bc1b3181bde3472264be4f6b89ceacb56179d7093329946abd6ba2501acfaf209d4f543352ff9fd38c47f1b WHIRLPOOL 687b1ba816dbff1b0a69cb05914dd7fb161bfd8c0fa4e26b77bb0ad26e27f7d7d94085a1022716a8d7a7563145f0acead9fccbbd332959d0216b81b27f3632e8 -DIST poppler-0.46.0.tar.xz 1680940 SHA256 967d35d13d61dee2fee656b80efef9e388a9e752bc79b7123f15b49c7769e487 SHA512 c303875ae8082e8cd0332ecff82e52678393d0015d092aee6fec3cc191218f155aca049ce43996c255122f550aae53ed019bb7855291d117d0b9e25ab83e9caf WHIRLPOOL 332aa78ba5a905a1c1b1fa62b20e730c7e7cde91f0a6f3c0291f85ea35188d65e496db8145c4eca8b382e8be6061bf16201603a3654c83f8c9f40e142fef0e74 DIST poppler-0.47.0.tar.xz 1682184 SHA256 b872e7228fc34a71ce4b47a5aea2a57ae67528818fa846e1e0eda089319bd242 SHA512 44b5b1546f66f1b95e1359f4fdf79458d902604dababbcc0ecb0d45ed90451680bb1f3b5e163bd17e16fda1b8656bec6c9072964f9d8f276cb38a7be95db63a5 WHIRLPOOL 1d7c0ad5e81fdbccc7e55f58ee94fd5ee9f905d94e8dfdde3ebb350e085d709e409aa6f981e0f0f12c73b9a6d94120250ba2be12a80adf7216e1fc11ec9e7ca8 DIST poppler-0.48.0.tar.xz 1684164 SHA256 85a003968074c85d8e13bf320ec47cef647b496b56dcff4c790b34e5482fef93 SHA512 20db22ab071479ba46f1a59b5bb5b2b5ba65da7d81037241b9aeb11234eaca007900b0368ffeb7a3b983807b1c39735ffabe9719f5856075d3a286461830a0d5 WHIRLPOOL a902a8340a33fd5cbe17846cfda5817771f8a04e01d8b872f3650013d05d17e81f395f2dd15865495b1f552f70a2e9f65a6f027b5d87a3ba5a5ce1c31dfddc68 DIST poppler-0.49.0.tar.xz 1685860 SHA256 14485f0e1e43dcddf49cfc02c2ccb92910ba3e0e91e06f4bd2642ec00cb3a79f SHA512 f840c28688318693efdf5af70608c72cdfc80399c33dc6f929918775b43b0c36695d8accc50fdce5d7c6bd0503206488d9658291613393e6ead0174bcb29dd79 WHIRLPOOL a3f9b13add6e103b491456abc7571dcdf66a3a1285c4dfe21289468d13b384adc1d99fb9ed8de4cc9150683914cc513666df6d0e218531e01acbd0884979cc9d diff --git a/app-text/poppler/files/poppler-0.46.0-crashfix-1.patch b/app-text/poppler/files/poppler-0.46.0-crashfix-1.patch deleted file mode 100644 index 6d2352b..00000000 --- a/app-text/poppler/files/poppler-0.46.0-crashfix-1.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7d3aea760a14a73962e429059f73d97391660367 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <[email protected]> -Date: Sat, 30 Jul 2016 17:32:59 +0200 -Subject: [PATCH 1/2] Fix abort on documents where the docinfo obj is not a - dict - -Bug #97134 ---- - poppler/PDFDoc.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc -index c91d6e4..a51d8b6 100644 ---- a/poppler/PDFDoc.cc -+++ b/poppler/PDFDoc.cc -@@ -14,7 +14,7 @@ - // under GPL version 2 or later - // - // Copyright (C) 2005, 2006, 2008 Brad Hards <[email protected]> --// Copyright (C) 2005, 2007-2009, 2011-2015 Albert Astals Cid <[email protected]> -+// Copyright (C) 2005, 2007-2009, 2011-2016 Albert Astals Cid <[email protected]> - // Copyright (C) 2008 Julien Rebetez <[email protected]> - // Copyright (C) 2008, 2010 Pino Toscano <[email protected]> - // Copyright (C) 2008, 2010, 2011 Carlos Garcia Campos <[email protected]> -@@ -646,7 +646,7 @@ void PDFDoc::setDocInfoStringEntry(const char *key, GooString *value) - GooString *PDFDoc::getDocInfoStringEntry(const char *key) { - Object infoObj; - getDocInfo(&infoObj); -- if (infoObj.isNull()) { -+ if (!infoObj.isDict()) { - return NULL; - } - --- -2.9.1 - diff --git a/app-text/poppler/files/poppler-0.46.0-crashfix-2.patch b/app-text/poppler/files/poppler-0.46.0-crashfix-2.patch deleted file mode 100644 index 3c2aa0a..00000000 --- a/app-text/poppler/files/poppler-0.46.0-crashfix-2.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3f5c84e17acfa71dfd44514384398f5a4c449630 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <[email protected]> -Date: Sat, 30 Jul 2016 17:50:42 +0200 -Subject: [PATCH 2/2] Check for XRefEntry existing before using it - -Bug #97005 ---- - poppler/Hints.cc | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/poppler/Hints.cc b/poppler/Hints.cc -index bdd0d32..6c2fc25 100644 ---- a/poppler/Hints.cc -+++ b/poppler/Hints.cc -@@ -5,7 +5,7 @@ - // This file is licensed under the GPLv2 or later - // - // Copyright 2010, 2012 Hib Eris <[email protected]> --// Copyright 2010, 2011, 2013, 2014 Albert Astals Cid <[email protected]> -+// Copyright 2010, 2011, 2013, 2014, 2016 Albert Astals Cid <[email protected]> - // Copyright 2010, 2013 Pino Toscano <[email protected]> - // Copyright 2013 Adrian Johnson <[email protected]> - // Copyright 2014 Fabio D'Urso <[email protected]> -@@ -43,7 +43,13 @@ Hints::Hints(BaseStream *str, Linearization *linearization, XRef *xref, Security - pageObjectFirst); - pageObjectFirst = 0; - } -- pageOffsetFirst = xref->getEntry(pageObjectFirst)->offset; -+ XRefEntry *pageObjectFirstXRefEntry = xref->getEntry(pageObjectFirst); -+ if (!pageObjectFirstXRefEntry) { -+ error(errSyntaxWarning, -1, "No XRef entry for first page object"); -+ pageOffsetFirst = 0; -+ } else { -+ pageOffsetFirst = pageObjectFirstXRefEntry->offset; -+ } - - if (nPages >= INT_MAX / (int)sizeof(Guint)) { - error(errSyntaxWarning, -1, "Invalid number of pages ({0:d}) for hints table", nPages); --- -2.9.1 - diff --git a/app-text/poppler/poppler-0.46.0-r1.ebuild b/app-text/poppler/poppler-0.46.0-r1.ebuild deleted file mode 100644 index fcc7008..00000000 --- a/app-text/poppler/poppler-0.46.0-r1.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/63" # 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 cairo-qt cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils" - -REQUIRED_USE="cairo-qt? ( qt4 )" - -# 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:= ) - ) - cairo-qt? ( >=x11-libs/cairo-1.10.0 ) - 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 TODO) - -PATCHES=( - "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" - "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" - "${FILESDIR}/${PN}-0.28.1-respect-cflags.patch" - "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" - "${FILESDIR}/${PN}-0.40-FindQt4.patch" - "${FILESDIR}/${P}-crashfix-1.patch" - "${FILESDIR}/${P}-crashfix-2.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 - - # Enable experimental patchset for subpixel font rendering using cairo - # backend for poppler-qt4 from https://github.com/giddie/poppler-qt4-cairo-backend. - if use cairo-qt; then - ewarn "Enabling unsupported, experimental cairo-qt patchset. Please do not report bugs." - epatch "${FILESDIR}/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch" - epatch "${FILESDIR}/cairo-qt-experimental/0002-Setting-default-Qt4-backend-to-Cairo.patch" - epatch "${FILESDIR}/cairo-qt-experimental/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch" - epatch "${FILESDIR}/cairo-qt-experimental/0004-Enabling-slight-hinting-in-Cairo-Backend.patch" - fi -} - -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 - -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 jpeg2k; then - mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2) - else - mycmakeargs+=(-DENABLE_LIBOPENJPEG=) - 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 -}
