Version bump, bug 384595. Ebuild by Rafał Mużyło.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 8eaafb3ac27260b081bd5497afcfd29fdf79ee80..b2827d3af1f0ded89baaee02f010f73fc9458716 100644 (file)
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.299 2011/09/17 10:57:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.300 2011/09/28 23:06:04 reavertm Exp $
+
+*poppler-0.18.0 (28 Sep 2011)
+
+  28 Sep 2011; Maciej Mrozowski <reavertm@gentoo.org> +poppler-0.18.0.ebuild,
+  +files/poppler-0.18.0-poppler_page_get_image-crash.patch:
+  Version bump, bug 384595. Ebuild by Rafał Mużyło.
 
   17 Sep 2011; Raúl Porcel <armin76@gentoo.org> poppler-0.16.7.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #377593

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 59f6864486f0f07eaa6a99cd311b2476525e38d8..e580b76fc41e4252c7304984db0d9939f1b53ed0 100644 (file)
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX poppler-0.18.0-poppler_page_get_image-crash.patch 794 RMD160 73479b6ddf1189288fffefdb26187bddcd8ad887 SHA1 924da5b92447cac090a30cdf5b1ac551e376bcf0 SHA256 caea3a33b2641982f72364d3ca7180de95bbf98d0c3c751771e70d27850a4ee0
 DIST poppler-0.14.5.tar.gz 1798194 RMD160 80d4441912b02d89777405ce03f8e175c4ccfa9e SHA1 e23b115e4ebc06c937318688b06a7c6b3319a00a SHA256 c805317c4c1a7080098ae8c7c2a1c1b8e2c784858fc2e04941878eeb8164814c
 DIST poppler-0.16.7.tar.gz 1952179 RMD160 279330e6feaf97a207f3396eab1af836d3d1f16c SHA1 26c735f863688f62b57d5159863fdad4272be89f SHA256 fab4e8af2d34d4142a718819fd747d40930b71ef520ee0e6bcc94e2c44f22bcd
+DIST poppler-0.18.0.tar.gz 1949737 RMD160 bda3b3323a466e7a886c3698761cc4dec017dd2e SHA1 21c0fb2381a552453aca484e16af5fdb8f66c816 SHA256 9019b15ef10a878e607e4088a27fb4967f61cdfada7806d0fee97954f76648e8
 EBUILD poppler-0.14.5-r1.ebuild 2582 RMD160 039ec616a568907fe24b303034afbb82fa3017f3 SHA1 82b4c9a4f5bfdddb1712246cb9e2ee64ffb1f40c SHA256 8d52fd70d76233e3d74254b277f34d89383f95c5f87c5c2c059fa32514e44e38
 EBUILD poppler-0.16.7.ebuild 2754 RMD160 ca6a6dcc8f79cf3328d6d2502b674835c0781249 SHA1 c3febaa0df0ab147cfae94f83483416222e1f14e SHA256 70b7b02f91969ef8d7915cab737169360ce0f2f32e0996736f06c101755452b9
-MISC ChangeLog 42075 RMD160 c95302a1eee06804e5a320cb5f653906b7d1be12 SHA1 c92342d84abea9ff286e075d0c145d8230a8d1f3 SHA256 2c82bbc99e3e504b5a648aeb9483312247181757574996f4e5bbdd67e2c28c5d
+EBUILD poppler-0.18.0.ebuild 2719 RMD160 61c3666aca706086300e9ccf758ff95e96a0011a SHA1 335cd5b749d020934af4f0d3477ec8b441450cc6 SHA256 985654c72bce669285a8b9d433d77278cc03a1d280ab38d6cee4d8d6288ad384
+MISC ChangeLog 42301 RMD160 7a859ce24d9d6904cfe5aadec8d4878a5935d7b5 SHA1 8a3f8eecebe8f5f8318a29dc0b21528dc12b24a9 SHA256 19ec493f5ee80f40388ac1b3b2ccd1e1d430061a27de06b3caa9766c05e8291a
 MISC metadata.xml 531 RMD160 bdae255e3871cac7966787a198b50d0f77180747 SHA1 8d191a0d9acc9c4494dd4b80ba72e420cf5489a4 SHA256 afef403de543eb24d44ec80c5353f932dffd16c5cd805f311a82089cdb4f4a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk50fSoACgkQuQc30/atMkBhVACeLuJA0OPDNjyKp9R/eou6GK3W
-tu0An2DTj5PIIiXmwg24hVIMT7l5JYfB
-=kGwX
+iEYEARECAAYFAk6DqGAACgkQFuHa/bHpVdsZcACfRLCDxmxd/1tXbYuqXmAEXf0F
+PakAn36b+Xqc4jET44m49JHANSvUU0KE
+=LP+0
 -----END PGP SIGNATURE-----

diff --git a/app-text/poppler/files/poppler-0.18.0-poppler_page_get_image-crash.patch b/app-text/poppler/files/poppler-0.18.0-poppler_page_get_image-crash.patch
new file mode 100644 (file)
index 0000000..b4388e0
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.18.0-poppler_page_get_image-crash.patch
@@ -0,0 +1,20 @@
+From d2706a05513134f961e2500e0e596f2769707ce5 Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson@redneon.com>
+Date: Wed, 28 Sep 2011 11:50:23 +0000
+Subject: cairo: fix crash when using poppler_page_get_image()
+
+---
+diff --git a/poppler/CairoOutputDev.h b/poppler/CairoOutputDev.h
+index effa9dd..0f202a5 100644
+--- a/poppler/CairoOutputDev.h
++++ b/poppler/CairoOutputDev.h
+@@ -434,6 +434,7 @@ public:
+   virtual void stroke(GfxState *state) { }
+   virtual void fill(GfxState *state) { }
+   virtual void eoFill(GfxState *state) { }
++  virtual void clipToStrokePath(GfxState *state) { }
+   virtual GBool tilingPatternFill(GfxState *state, Catalog *cat, Object *str,
+                                 double *pmat, int paintType, int tilingType, Dict *resDict,
+                                 double *mat, double *bbox,
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/app-text/poppler/poppler-0.18.0.ebuild b/app-text/poppler/poppler-0.18.0.ebuild
new file mode 100644 (file)
index 0000000..31d0708
--- /dev/null
+++ b/app-text/poppler/poppler-0.18.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.0.ebuild,v 1.1 2011/09/28 23:06:04 reavertm Exp $
+
+EAPI="4"
+
+inherit cmake-utils
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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"
+IUSE="cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils +xpdf-headers"
+
+# 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-0.9.12 )
+       )
+       curl? ( net-misc/curl )
+       jpeg? ( virtual/jpeg )
+       jpeg2k? ( media-libs/openjpeg )
+       lcms? ( =media-libs/lcms-1* )
+       png? ( >=media-libs/libpng-1.4 )
+       qt4? (
+               x11-libs/qt-core:4
+               x11-libs/qt-gui:4
+       )
+       tiff? ( media-libs/tiff )
+"
+DEPEND="${COMMON_DEPEND}
+       dev-util/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+       !dev-libs/poppler
+       !dev-libs/poppler-glib
+       !dev-libs/poppler-qt3
+       !dev-libs/poppler-qt4
+       !app-text/poppler-utils
+       cjk? ( >=app-text/poppler-data-0.4.4 )
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
+
+PATCHES=(
+       "${FILESDIR}/${P}-poppler_page_get_image-crash.patch"
+)
+
+src_configure() {
+       mycmakeargs=(
+               -DBUILD_GTK_TESTS=OFF
+               -DBUILD_QT4_TESTS=OFF
+               -DBUILD_CPP_TESTS=OFF
+               -DENABLE_SPLASH=ON
+               -DENABLE_ZLIB=ON
+               $(cmake-utils_use_enable curl LIBCURL)
+               $(cmake-utils_use_enable cxx CPP)
+               $(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
+               $(cmake-utils_use_enable lcms)
+               $(cmake-utils_use_enable utils)
+               $(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
+               $(cmake-utils_use_with cairo)
+               $(cmake-utils_use_with introspection GObjectIntrospection)
+               $(cmake-utils_use_with jpeg)
+               $(cmake-utils_use_with png)
+               $(cmake-utils_use_with qt4)
+               $(cmake-utils_use_with tiff)
+       )
+
+       cmake-utils_src_configure
+}
+
+src_install() {
+       cmake-utils_src_install
+
+       if use cairo && use doc; then
+               # For now install gtk-doc there
+               insinto /usr/share/gtk-doc/html/poppler
+               doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
+       fi
+}
+
+pkg_postinst() {
+       ewarn "After upgrading app-text/poppler you may need to reinstall packages"
+       ewarn "linking to it. If you're not a portage-2.2_rc user, you're advised"
+       ewarn "to run revdep-rebuild"
+}