fix build with poppler 0.20, by Rafał Mużyło, bug #416545

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

4 files changed, 95 insertions, 4 deletions

diff --git a/dev-tex/luatex/ChangeLog b/dev-tex/luatex/ChangeLog
index 1c0e4f17e59b..18c39c9933c7 100644
--- a/dev-tex/luatex/ChangeLog
+++ b/dev-tex/luatex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tex/luatex
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.99 2012/05/09 13:27:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.100 2012/07/09 13:15:20 aballier Exp $
+
+  09 Jul 2012; Alexis Ballier <aballier@gentoo.org> +files/poppler020.patch,
+  luatex-0.70.1.ebuild:
+  fix build with poppler 0.20, by Rafał Mużyło, bug #416545
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org> luatex-0.70.1.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-tex/luatex/Manifest b/dev-tex/luatex/Manifest
index 337b6c12d6f0..8f967e02738d 100644
--- a/dev-tex/luatex/Manifest
+++ b/dev-tex/luatex/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX poppler018.patch 5041 SHA256 98317c41cab055cde67fd1eefa6c79fa8ec0ac2b36d93a094abe9eb8e834221c SHA512 e8b1660cb6674a8d2f68f29022d0ea33ca00795c8360a9656c5ad84776c86d3ab0a3c0895632957c5ed93fcab96e11e6bc7eb1a03df518122fcc3fa574b095ee WHIRLPOOL 0a14b110479acbe5d31a40642b53e0bcf03226acac19596f5dc885ff8a7a9c83895d8409044e96630bc66cf77ea915ce41f580a43dc48df423519dc0a9226335
+AUX poppler020.patch 2909 SHA256 ffec5fd2e311841ee355deabfe13b37fdaea781608e95a2a5ab037d1cdd04ea8 SHA512 9517efce4ede9b792f27647ec4ed95d447572a9cbb3ee58e089b658ccc55bbb6a7843768b5962a4535ed77ab364e73f4fd1248e92a5a480ce30429303664f385 WHIRLPOOL db89a3e07ace603aea4abf71a97cd26f0b16c60b939f0c361db77d8af22c03b0003440e38164a0052258a8fbaceb283bac401a8254fa0b42e71179b715151f06
 DIST luatex-beta-0.70.1-doc.tar.bz2 1048489 SHA256 4f1d24777725a606efbf5d7a59064245c46fb29b8066236c6b48fb423a595606 SHA512 eb4de91a80a6afccf5cca5cb05d5c1378a60ec35763e5ef5e9dbadaa2a276758a446e01d66e76a78e91442274778c10c73458b513af903e7221d90beb644afa9 WHIRLPOOL 97142a3a3c23d01f3b21963690f7362edf0c7f0de1ad77295361122a81c92459cb2ecd36baaea3588b7ad4f8b81c5dfa81d22df7a5529cb5b8b2b39fe6ce84be
 DIST luatex-beta-0.70.1.tar.bz2 8181155 SHA256 c641a4ba1535ede6ee8e2a958d8c4b436f5979c5be6f3f51d3dec5b4df6bb6ed SHA512 e04a9b96f349bf9036ef4c01746dee96ebf245cd4da6b719f546223e05cb98fb844e20878a64f80f42c77e220fac01ee2d97ad56939c1fb3af44faab53c603cb WHIRLPOOL 63dfdf182d3f1aadd6fc802e424b3791eda4df7eb8d707ad719d2ad0f97946b365316f6b9caed2362d5827280e9ddf2e750c8beeb61277dac72bffaed06a4fc9
-EBUILD luatex-0.70.1.ebuild 3604 SHA256 e4e5c2092cdf712f8d5d144749b4bdcc6a40f92b21fbdca37406080bd4fe2f37 SHA512 357feaeb0d944ca4d219fab5b2bce9b719bafd9fe3914c87a0134ba547afa9c19a1f6b9fc37023763fedaa353860cc371dcfe175bf4cef64e52cb2c51e74137d WHIRLPOOL 77b9b827bf17be43b9fcf1f9ae9c01f6ecb62b615652668c885d6acde243d53730dfd24c491e5dcc67020e7d2dea1a94567f73482fa1098b1a44cec4f11dd9c1
-MISC ChangeLog 12313 SHA256 cda7cb692fc0b70c7efd93dbc3f3038262f393d4fc3a1bcf7b6f193e634982f9 SHA512 87df4cbdccb1c8a89bb9ebe50b121bf4d7aaefe8cc68f45e7d3f72a97382f6e5921bad6f9fe9aebca34dedc46582cfcbdcdf4b5c5fd807f330578a357d103989 WHIRLPOOL 9ce055cd0745067f08a651c9e2e2a96357c549478fabdcb365e7b3d4df86d9f05e74efe4d9ca931ba5c1dd6111d152d57a47b993ba34b37373856b6871b6663f
+EBUILD luatex-0.70.1.ebuild 3688 SHA256 4374c9f333029d29e888b25c729b681634e5a47266f94791abe0e08f5cffe82e SHA512 aa6b06307e78775cb8c3ee7d1092531b4b8c2cba8e980bd68d7a0287a57840f37691223a40149303f00c295e30bf0d1b19ccf53bd4d5b2dbf509ef43b560644c WHIRLPOOL dc6ffc688104a53ec534a0fd257a32f3a1aefe440fc0f77dc5dadee5cd86e195eeee68234dc458598fff1be89ae379b2785f8c853ec0524584d35b378e6f8400
+MISC ChangeLog 12479 SHA256 62eef999d2599e79cac56683ea7893751065b1a7b89abd5e556c763b70cb295d SHA512 208e1bcb53f75d15c00565c91af05a69a276e09852ef7c0d23c6f06f3af691fcfd2d022cb5fdac621a840c9a55a8448184c4aeb43f168251e1cdb9fce0d2c3f9 WHIRLPOOL cbbf0f0fe4f79baf00d9a4142ed4ab4aaf31834d5e086b338f5c4f523ecaecf8f0f21b8ee88fba4f45264405a945a646e8202f8998780e02df1852043f2888b8
 MISC metadata.xml 336 SHA256 126018a4822f911e52afe63656a10f2a7b0b938ea106f2a2caef00bdc18a845f SHA512 d998dbfe23cbb7f60db7b876e8ac3d039281ad9568aeb45a494774eb65468392523cdfc1b5cc8b621fc9a2f2f7f33dc3e351d1cf902f9ecf3f122534ef4767e0 WHIRLPOOL 3350c9964adc178cb58ee77019669fa51899cd71734ae1ff8f4646d1f9e141973c9f686f43e5995f1a7258d92bd173176dc0d9c3d8bcc09b96c37a0b7a0fb4a2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEARECAAYFAk/62W4ACgkQvFcC4BYPU0pIhgCfd823DZlQ4bz2Rat1YIc1yW9c
+uXYAnR+RO8LETz1kFQqZgfgLPoZVFOxA
+=VSka
+-----END PGP SIGNATURE-----
diff --git a/dev-tex/luatex/files/poppler020.patch b/dev-tex/luatex/files/poppler020.patch
new file mode 100644
index 000000000000..d3db830d3430
--- /dev/null
+++ b/dev-tex/luatex/files/poppler020.patch
@@ -0,0 +1,75 @@
+https://bugs.gentoo.org/show_bug.cgi?id=416545
+build with poppler-0.20 by Rafał Mużyło
+
+--- source/texk/web2c/luatexdir/lua/lepdflib.cc	2012-05-18 16:23:53.000000000 +0200
++++ source/texk/web2c/luatexdir/lua/lepdflib.cc	2012-05-18 17:43:12.959843483 +0200
+@@ -151,7 +151,7 @@ static int l_new_Annot(lua_State * L)
+         pdfdoc_changed_error(L);
+     uout = new_Annot_userdata(L);
+     uout->d =
+-        new Annot((XRef *) uxref->d, (Dict *) udict->d, (Catalog *) ucatalog->d,
++        new Annot(udict->pd->doc, (Dict *) udict->d,
+                   (Object *) uref->d);
+     uout->atype = ALLOC_LEPDF;
+     uout->pc = uxref->pc;
+@@ -173,7 +173,7 @@ static int l_new_Annots(lua_State * L)
+         pdfdoc_changed_error(L);
+     uout = new_Annots_userdata(L);
+     uout->d =
+-        new Annots((XRef *) uxref->d, (Catalog *) ucatalog->d,
++        new Annots(uannotsobj->pd->doc,
+                    (Object *) uannotsobj->d);
+     uout->atype = ALLOC_LEPDF;
+     uout->pc = uxref->pc;
+@@ -363,7 +363,7 @@ static int m_##type##__tostring(lua_Stat
+ // Annot
+ 
+ m_poppler_get_BOOL(Annot, isOk);
+-m_poppler_get_OBJECT(Annot, getAppearance);
++m_poppler_get_OBJECT(Annot, getAppearanceResDict);
+ m_poppler_get_poppler(Annot, AnnotBorder, getBorder);
+ 
+ static int m_Annot_match(lua_State * L)
+@@ -398,7 +398,7 @@ static int m_Annot__gc(lua_State * L)
+ 
+ static const struct luaL_Reg Annot_m[] = {
+     {"isOk", m_Annot_isOk},
+-    {"getAppearance", m_Annot_getAppearance},
++    {"getAppearanceResDict", m_Annot_getAppearanceResDict},
+     {"getBorder", m_Annot_getBorder},
+     {"match", m_Annot_match},
+     {"__tostring", m_Annot__tostring},
+@@ -1249,7 +1249,7 @@ static int m_Object_getType(lua_State *
+ 
+ static int m_Object_getTypeName(lua_State * L)
+ {
+-    char *s;
++    const char *s;
+     udstruct *uin;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+@@ -1936,7 +1936,7 @@ static int m_Page_getLinks(lua_State * L
+     if ((uin->pd != NULL && uin->pd->pc != uin->pc)
+         || (ucat->pd != NULL && ucat->pd->pc != ucat->pd->pc))
+         pdfdoc_changed_error(L);
+-    links = ((Page *) uin->d)->getLinks((Catalog *) ucat->d);
++    links = ((Page *) uin->d)->getLinks();
+     if (links != NULL) {
+         uout = new_Links_userdata(L);
+         uout->d = links;
+@@ -2531,7 +2531,6 @@ m_poppler_get_INT(XRef, getNumObjects);
+ m_poppler_get_INT(XRef, getRootNum);
+ m_poppler_get_INT(XRef, getRootGen);
+ // getStreamEnd
+-m_poppler_get_INT(XRef, getSize);
+ // getEntry
+ m_poppler_get_poppler(XRef, Object, getTrailerDict);
+ 
+@@ -2558,7 +2557,6 @@ static const struct luaL_Reg XRef_m[] =
+     {"getRootNum", m_XRef_getRootNum},
+     {"getRootGen", m_XRef_getRootGen},
+     //
+-    {"getSize", m_XRef_getSize},
+     {"getTrailerDict", m_XRef_getTrailerDict},
+     {"__tostring", m_XRef__tostring},
+     {NULL, NULL}                // sentinel
diff --git a/dev-tex/luatex/luatex-0.70.1.ebuild b/dev-tex/luatex/luatex-0.70.1.ebuild
index 41c7af3cc273..c3c157e6d9f6 100644
--- a/dev-tex/luatex/luatex-0.70.1.ebuild
+++ b/dev-tex/luatex/luatex-0.70.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.70.1.ebuild,v 1.12 2012/05/09 13:27:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.70.1.ebuild,v 1.13 2012/07/09 13:15:20 aballier Exp $
 
 EAPI="2"
 
@@ -31,6 +31,7 @@ PRELIBS="libs/obsdcompat"
 
 src_prepare() {
 	has_version '>=app-text/poppler-0.18.0:0' && epatch "${FILESDIR}/poppler018.patch"
+	has_version '>=app-text/poppler-0.20.0:0' && epatch "${FILESDIR}/poppler020.patch"
 	S="${S}/build-aux" elibtoolize --shallow
 }