Fix build with latest poppler, bug #282833

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 48 insertions, 7 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/Manifest b/dev-tex/pdftex/Manifest
index 9165ea92a86b..9070bebfd619 100644
--- a/dev-tex/pdftex/Manifest
+++ b/dev-tex/pdftex/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA1
 
 AUX pdftex-1.40.9-getline.patch 483 RMD160 ad59f68ec3214f1dc5c8e0fa928d75e24f8363ad SHA1 9ee9ecd0d44d38ce25b42f9882a6e8db1575ece8 SHA256 feb214f1614b1d62e027efaad7348b6a359a675b5b320fad76c5aacbfe1ea50f
+AUX pdftex-1.40.9-poppler-0.11.3.patch 1926 RMD160 3f0a2ec242f2247a193aea6573f0f705d56ba010 SHA1 98e53c467764065ce632d4e17c5d0392f4c6ab2f SHA256 0d9441dbeee2729c2ef69b0393b3ac6baf95f272a33d9f2ede9f75b687efa428
 AUX pdftex-1.40.9-poppler-0.11.patch 596 RMD160 51737e4d9d10b2a883c4b304d28c908b36871371 SHA1 71927b2e8877cea1277576f5cad0b7c5484a2669 SHA256 0bc05b34bb76092e7f27dd35f236a3b45321a7b79a3e9dbb424bdc0ed25455ac
 AUX pdftex-1.40.9-poppler.patch 2855 RMD160 ae883ff7dbafd9452aa3d52233df3af2e5f2e30f SHA1 cb76325eb46aca46c16828907a7f62a830d13703 SHA256 e701f2627e81c5723e0a99487e3275008cba3448207ebd35a55bb4ed829da12d
 AUX pdftex-1.40.9-xpdfversion.patch 737 RMD160 b736d3fa14b5efda42505a78e2d2fd315132260c SHA1 aebf5ccfe9ac1c6a92e4d96a4a2dd59e32ee3c10 SHA256 dfefc2eab684832ba8bc140ad8fb1c52d1009d3d7c0c622f10a68cdd60bfca7d
 DIST pdftex-1.40.9.tar.bz2 3899364 RMD160 09df8924b478a26a4816a55ae97822127bb1c476 SHA1 8302ef0c9651ff293916505b122ad59db955e318 SHA256 78e17e070c27b6645db291fa1d7b390d19bf090bca4326806ed292c9809dc27c
-EBUILD pdftex-1.40.9.ebuild 2666 RMD160 54e0aa519332817f3a0f7914a3d8e57cdc712b7a SHA1 f5dc01472963919fbc075d6a6dc23309fefd9a71 SHA256 d092eb89e8c554ef1ca67f405ad2bedeb23e8f4c2843f77adb11b50cab279bb7
-MISC ChangeLog 2388 RMD160 d74cff4eeef1f4ddb4e99c05de63bbb0fcaa454b SHA1 11be0f463887c85dabcd5ffb2ddbdf0ddb6490d7 SHA256 666246df13b60161bff9534bc477f0439a6160dc4dff652c24ec52b4c525d470
+EBUILD pdftex-1.40.9.ebuild 2757 RMD160 ca94dac822deb23892f009c7646d49bee09f055d SHA1 ccf684177cb86a9c71c900e4099393f454cc9804 SHA256 f87ec5298af67208fef0da6ef84a49824cdc505fd3960530093dc8e6c7df0541
+MISC ChangeLog 2553 RMD160 3724e0eaa1123b1d208fbbad6ec0ca6a649446de SHA1 203ede3ae185d4bf6fcc3f1c4d78aed2c2502064 SHA256 423c35dbf7bb6969af50e48163adef7ba0054a16dc546083c05831deb06e1389
 MISC metadata.xml 638 RMD160 59e3769086396359f1a50ee60b6702555770e33e SHA1 f9a566b850466987e74d5c16c345c54506ae4a0d SHA256 b28290517ed75fbaaa0282cdca3692f11635d173ee5dc5cb342f6071dbb3d3ea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoXy8QACgkQvFcC4BYPU0rqRwCdHKgeAOCs5kx+XhVeYzVAp1tr
-ARsAn0GL5fHVKUWDiU4oTbkB7dVNIXbp
-=yf5S
+iEYEARECAAYFAkqWP/kACgkQvFcC4BYPU0rYLACgkigQRBCjxDs2D1Gsu+zf7YZY
+hK0AmwRP3MfUfVV9HXrmZLD0uPEpTGuO
+=M4yQ
 -----END PGP SIGNATURE-----
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
 }