diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-02-17 13:50:24 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-02-17 13:50:24 +0000 |
| commit | 8bd11d9addb69270ab8566769d93a83362fd59be (patch) | |
| tree | d704d36eb1c293ffd1c2d2e4b487bd925dc4a5e8 /app-text/xpdf | |
| parent | Add a patch from debian to fix vpe invocation wrt its shebang, part of bug #2... (diff) | |
| download | gentoo-2-8bd11d9addb69270ab8566769d93a83362fd59be.tar.gz gentoo-2-8bd11d9addb69270ab8566769d93a83362fd59be.tar.bz2 gentoo-2-8bd11d9addb69270ab8566769d93a83362fd59be.zip | |
fix build with poppler 0.16, bug #349942
(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)
Diffstat (limited to 'app-text/xpdf')
| -rw-r--r-- | app-text/xpdf/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/xpdf/files/xpdf-3.02-poppler-0.16.patch | 13 | ||||
| -rw-r--r-- | app-text/xpdf/xpdf-3.02-r4.ebuild | 9 |
3 files changed, 24 insertions, 4 deletions
diff --git a/app-text/xpdf/ChangeLog b/app-text/xpdf/ChangeLog index 40fecc5cd85f..b2d70577dcd6 100644 --- a/app-text/xpdf/ChangeLog +++ b/app-text/xpdf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/xpdf # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.191 2011/01/15 15:04:22 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.192 2011/02/17 13:50:24 aballier Exp $ + + 17 Feb 2011; Alexis Ballier <aballier@gentoo.org> xpdf-3.02-r4.ebuild, + +files/xpdf-3.02-poppler-0.16.patch: + fix build with poppler 0.16, bug #349942 *xpdf-9999 (15 Jan 2011) diff --git a/app-text/xpdf/files/xpdf-3.02-poppler-0.16.patch b/app-text/xpdf/files/xpdf-3.02-poppler-0.16.patch new file mode 100644 index 000000000000..ea2d5ee2be07 --- /dev/null +++ b/app-text/xpdf/files/xpdf-3.02-poppler-0.16.patch @@ -0,0 +1,13 @@ +Index: xpdf-3.02-poppler/XPDFViewer.cc +=================================================================== +--- xpdf-3.02-poppler.orig/XPDFViewer.cc ++++ xpdf-3.02-poppler/XPDFViewer.cc +@@ -3447,7 +3447,7 @@ void XPDFViewer::printPrintCbk(Widget wi + lastPage = doc->getNumPages(); + } + +- psOut = new PSOutputDev(psFileName->getCString(), doc->getXRef(), ++ psOut = new PSOutputDev(psFileName->getCString(), doc, doc->getXRef(), + doc->getCatalog(), + NULL, + firstPage, lastPage, psModePS); diff --git a/app-text/xpdf/xpdf-3.02-r4.ebuild b/app-text/xpdf/xpdf-3.02-r4.ebuild index bcac04a7daba..3b4de810184b 100644 --- a/app-text/xpdf/xpdf-3.02-r4.ebuild +++ b/app-text/xpdf/xpdf-3.02-r4.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r4.ebuild,v 1.8 2010/10/10 17:37:19 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r4.ebuild,v 1.9 2011/02/17 13:50:24 aballier Exp $ EAPI=2 -inherit fdo-mime gnome2 eutils flag-o-matic +inherit fdo-mime gnome2 eutils flag-o-matic toolchain-funcs DESCRIPTION="An X Viewer for PDF Files" HOMEPAGE="http://www.foolabs.com/xpdf/" @@ -43,6 +43,8 @@ src_prepare() { export EPATCH_SOURCE="${PATCHDIR}" epatch use nodrm && epatch "${PATCHDIR}/xpdf-3.02-poppler-nodrm.patch" + has_version '>=app-text/poppler-0.16' && epatch "${FILESDIR}/${P}-poppler-0.16.patch" + mv parseargs.c parseargs.cc } src_configure() { @@ -50,6 +52,7 @@ src_configure() { } src_compile() { + tc-export CXX emake || die } |