diff options
| -rw-r--r-- | dev-tex/pdftex/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-tex/pdftex/files/pdftex-1.40.9-poppler-0.11.3.patch | 35 | ||||
| -rw-r--r-- | dev-tex/pdftex/pdftex-1.40.9.ebuild | 3 |
3 files changed, 42 insertions, 2 deletions
diff --git a/dev-tex/pdftex/ChangeLog b/dev-tex/pdftex/ChangeLog index 59c3fd5c6424..ac791d7690df 100644 --- a/dev-tex/pdftex/ChangeLog +++ b/dev-tex/pdftex/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-tex/pdftex # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/ChangeLog,v 1.17 2009/05/23 10:11:08 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/ChangeLog,v 1.18 2009/08/27 08:12:35 aballier Exp $ + + 27 Aug 2009; Alexis Ballier <aballier@gentoo.org> pdftex-1.40.9.ebuild, + +files/pdftex-1.40.9-poppler-0.11.3.patch: + Fix build with latest poppler, bug #282833 23 May 2009; Alexis Ballier <aballier@gentoo.org> pdftex-1.40.9.ebuild, +files/pdftex-1.40.9-getline.patch: diff --git a/dev-tex/pdftex/files/pdftex-1.40.9-poppler-0.11.3.patch b/dev-tex/pdftex/files/pdftex-1.40.9-poppler-0.11.3.patch new file mode 100644 index 000000000000..973ec53772ee --- /dev/null +++ b/dev-tex/pdftex/files/pdftex-1.40.9-poppler-0.11.3.patch @@ -0,0 +1,35 @@ +Index: pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc +=================================================================== +--- pdftex-1.40.9.orig/src/texk/web2c/pdftexdir/pdftoepdf.cc ++++ pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc +@@ -685,7 +685,7 @@ read_pdf_info(char *image_name, char *pa + Page *page; + int rotate; + PDFRectangle *pagebox; +- float pdf_version_found, pdf_version_wanted; ++ int minor_pdf_version_found, major_pdf_version_found; + // initialize + if (!isInit) { + globalParams = new GlobalParams(); +@@ -700,15 +700,15 @@ read_pdf_info(char *image_name, char *pa + // this works only for PDF 1.x -- but since any versions of PDF newer + // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will + // then have to changed drastically anyway. +- pdf_version_found = pdf_doc->doc->getPDFVersion(); +- pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1); +- if (pdf_version_found > pdf_version_wanted) { ++ minor_pdf_version_found = pdf_doc->doc->getPDFMinorVersion(); ++ major_pdf_version_found = pdf_doc->doc->getPDFMajorVersion(); ++ if (major_pdf_version_found > 1 || minor_pdf_version_found > minor_pdf_version_wanted) { + char msg[] = +- "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed"; ++ "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed"; + if (pdf_inclusion_errorlevel > 0) { +- pdftex_fail(msg, pdf_version_found, pdf_version_wanted); ++ pdftex_fail(msg, major_pdf_version_found, minor_pdf_version_found, minor_pdf_version_wanted); + } else { +- pdftex_warn(msg, pdf_version_found, pdf_version_wanted); ++ pdftex_warn(msg, major_pdf_version_found, minor_pdf_version_found, minor_pdf_version_wanted); + } + } + epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages(); diff --git a/dev-tex/pdftex/pdftex-1.40.9.ebuild b/dev-tex/pdftex/pdftex-1.40.9.ebuild index 37d3a6ecb047..395d218528fd 100644 --- a/dev-tex/pdftex/pdftex-1.40.9.ebuild +++ b/dev-tex/pdftex/pdftex-1.40.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/pdftex-1.40.9.ebuild,v 1.17 2009/05/23 10:11:08 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/pdftex-1.40.9.ebuild,v 1.18 2009/08/27 08:12:35 aballier Exp $ inherit libtool toolchain-funcs eutils multilib @@ -29,6 +29,7 @@ src_unpack() { epatch "${FILESDIR}/${P}-xpdfversion.patch" epatch "${FILESDIR}/${P}-poppler-0.11.patch" epatch "${FILESDIR}/${P}-getline.patch" + has_version '>=dev-libs/poppler-0.11.3' && epatch "${FILESDIR}/${P}-poppler-0.11.3.patch" elibtoolize } |