fix build with latest poppler, bug #269545

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

4 files changed, 36 insertions, 4 deletions

diff --git a/dev-tex/pdftex/ChangeLog b/dev-tex/pdftex/ChangeLog
index cab10f1490ce..f8ae808a6f96 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.15 2009/03/30 01:32:20 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/ChangeLog,v 1.16 2009/05/14 17:20:34 aballier Exp $
+
+  14 May 2009; Alexis Ballier <aballier@gentoo.org> pdftex-1.40.9.ebuild,
+  +files/pdftex-1.40.9-poppler-0.11.patch:
+  fix build with latest poppler, bug #269545
 
   30 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> pdftex-1.40.9.ebuild:
   Update dependencies w.r.t. bug 264230, fully-split-out poppler transition.
diff --git a/dev-tex/pdftex/Manifest b/dev-tex/pdftex/Manifest
index c6e15e92b6d7..38ad18905833 100644
--- a/dev-tex/pdftex/Manifest
+++ b/dev-tex/pdftex/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+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 2579 RMD160 d255d4c326bf5bd314138b462bd435b4ab9a8dfc SHA1 9288127872a12fcc182a1fabfeea85c651656ecc SHA256 1dba85d77649a9f587b2f6479bf4e9afc189223e661046fdb5dd2253b644ac9d
-MISC ChangeLog 2050 RMD160 c03c569fb8ccbd417d5d16991fdc8e916963d1e3 SHA1 af13db33c480d643b935a65e2e5be22d169059e5 SHA256 9940d26b10bbf05df656b4f0a7236126f00899f229d266ff13cba6e0046abc70
+EBUILD pdftex-1.40.9.ebuild 2625 RMD160 9bb38b0ce6c7b8208c1d86a31f8f0523dcd1820d SHA1 92c452617361560dfdb0c3798673f85f1f1be772 SHA256 1af7b974498ef964c2a20820e6e2d2d549cb6779732813fb83e2846f4a3bd868
+MISC ChangeLog 2213 RMD160 790aa36ad05581dac6fb9b07fb6cbfd5353d7f2a SHA1 000feeab6ab759cd8ec03b4e349b6dedefd2ed47 SHA256 e92e4a6d6e6087fa5997cce37e3fcf54487d64104cc91218f29ba2d75e568172
 MISC metadata.xml 638 RMD160 59e3769086396359f1a50ee60b6702555770e33e SHA1 f9a566b850466987e74d5c16c345c54506ae4a0d SHA256 b28290517ed75fbaaa0282cdca3692f11635d173ee5dc5cb342f6071dbb3d3ea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoMUuQACgkQvFcC4BYPU0plegCdEn/rY0Wr8qR2ksTPAEYvjejR
+CVMAoJKRnF3YgIpGUZ+PC1PJxrGMtQEt
+=ZJOo
+-----END PGP SIGNATURE-----
diff --git a/dev-tex/pdftex/files/pdftex-1.40.9-poppler-0.11.patch b/dev-tex/pdftex/files/pdftex-1.40.9-poppler-0.11.patch
new file mode 100644
index 000000000000..17d04f274802
--- /dev/null
+++ b/dev-tex/pdftex/files/pdftex-1.40.9-poppler-0.11.patch
@@ -0,0 +1,16 @@
+http://cgit.freedesktop.org/poppler/poppler/commit/?id=80f415176952635a485356cf36048eee53396c25
+https://bugs.gentoo.org/show_bug.cgi?id=269545
+
+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
+@@ -645,7 +645,7 @@ static void writeEncodings()
+     }
+     for (r = encodingList; r != 0; r = n) {
+         n = r->next;
+-        delete r->font;
++        r->font->decRefCnt();
+         delete r;
+     }
+ }
diff --git a/dev-tex/pdftex/pdftex-1.40.9.ebuild b/dev-tex/pdftex/pdftex-1.40.9.ebuild
index de368bac28f6..c44f0e9743f7 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.15 2009/03/30 01:32:20 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/pdftex-1.40.9.ebuild,v 1.16 2009/05/14 17:20:34 aballier Exp $
 
 inherit libtool toolchain-funcs eutils multilib
 
@@ -27,6 +27,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-poppler.patch"
 	epatch "${FILESDIR}/${P}-xpdfversion.patch"
+	epatch "${FILESDIR}/${P}-poppler-0.11.patch"
 	elibtoolize
 }