Backport the poppler-0.26 patch to luatex-0.70 and apply it conditionally, bug 511508

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

4 files changed, 126 insertions, 8 deletions

diff --git a/dev-tex/luatex/ChangeLog b/dev-tex/luatex/ChangeLog
index 77a0ea1c2036..2008ad0c1c1e 100644
--- a/dev-tex/luatex/ChangeLog
+++ b/dev-tex/luatex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tex/luatex
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.139 2014/08/10 21:27:15 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.140 2014/10/11 10:48:02 dilfridge Exp $
+
+  11 Oct 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  luatex-0.70.1-r2.ebuild, +files/poppler026-backport.patch:
+  Backport the poppler-0.26 patch to luatex-0.70 and apply it conditionally,
+  bug 511508
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> luatex-0.70.1-r2.ebuild,
   luatex-0.76.0.ebuild:
diff --git a/dev-tex/luatex/Manifest b/dev-tex/luatex/Manifest
index b127b335fcc9..5f818be70ad7 100644
--- a/dev-tex/luatex/Manifest
+++ b/dev-tex/luatex/Manifest
@@ -6,20 +6,33 @@ AUX kpathsea2012.patch 944 SHA256 afb87b3c1cb9317666a7f45b6ecd6ad1078896d56b91fc
 AUX poppler018.patch 5041 SHA256 98317c41cab055cde67fd1eefa6c79fa8ec0ac2b36d93a094abe9eb8e834221c SHA512 e8b1660cb6674a8d2f68f29022d0ea33ca00795c8360a9656c5ad84776c86d3ab0a3c0895632957c5ed93fcab96e11e6bc7eb1a03df518122fcc3fa574b095ee WHIRLPOOL 0a14b110479acbe5d31a40642b53e0bcf03226acac19596f5dc885ff8a7a9c83895d8409044e96630bc66cf77ea915ce41f580a43dc48df423519dc0a9226335
 AUX poppler020.patch 2909 SHA256 ffec5fd2e311841ee355deabfe13b37fdaea781608e95a2a5ab037d1cdd04ea8 SHA512 9517efce4ede9b792f27647ec4ed95d447572a9cbb3ee58e089b658ccc55bbb6a7843768b5962a4535ed77ab364e73f4fd1248e92a5a480ce30429303664f385 WHIRLPOOL db89a3e07ace603aea4abf71a97cd26f0b16c60b939f0c361db77d8af22c03b0003440e38164a0052258a8fbaceb283bac401a8254fa0b42e71179b715151f06
 AUX poppler022.patch 12617 SHA256 4b19ef98d1142e775efa4ea3911b720f9d524c813a512d7673c8441a34e2488c SHA512 998c948bc02014bf1e79e9c8ee2c7681568b827c467f15eed0ec90342d65f43ec36b9acaf7cdf51404234eab14337122d330adc647ce97b3c299a2c368bf9a9a WHIRLPOOL 5a4c34a509c9368d5235ff5674ed243c78e16c0fafc5134da95884f7d18dc4678e7126e6cfccf9a27eac96bcae23b8c96a6b1aa84c60bf3efdf2249461d7dff8
+AUX poppler026-backport.patch 3914 SHA256 e5c0d7a2c9b8cc280b21edf831ebee19c734a787c3c53a3d7692b61dee7ad829 SHA512 fbeae638e8cb0f75b3ced8c2db813d47dd8701665861f6c0ec3c25f21de842f8978a2dccf54531b8f446dd6b4bb39f2e6c90d72f52ffedbc0404ae7c45432569 WHIRLPOOL 0815b0b7394afa35a663a1b2a9c83885160f9d34c8f4fe1141e2ff13931e2a48ff789edac5e89505dc1f0b68bc9fb2b3cf4cdff547a8d0fc67979e5ee91cda43
 AUX poppler026.patch 5169 SHA256 4182b5f491174594927b847675ffbad9fdbcbd75bdbda0955fa2e6c80288f3c4 SHA512 427a6fe39dfd79dcc9ee726b0eb7a70633815d17d6ab336e8ec564676c357f32c679866f4088043d6fd5bcae61763509995a255b65accd3de73fb38c5ecd362c WHIRLPOOL 55a1d6b4c64bfb8ee90ed4761d727341fbb787e86377e523e38c55896ecf148b0e9f57545d484e1587655d2ed4df93460cd95ba19e07c89fa6495882e9dd5582
 AUX remove-zlib-version-check.patch 938 SHA256 5c569bab0ccecc38e89f0bfeeaeabb921ce2fe38e17ecd0d7da11a75c0ed9d19 SHA512 1d19fb396af846a2ffa9ab7ffcf20d363956921cec92d6b03e499e26bac3802a8ca874b982c25ef99a560af48f0d85b0a36ac5786f7c3129abba3b8d9e38c780 WHIRLPOOL 2b06826e5f8bd2bc50b933a7636b5185bd21b44e2c5aad54e4e641bd39c74a29235928f3a6e36d551b679dac6ca2fa8c969447c520805807a487b6bd0b82c79c
 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
 DIST luatex-beta-0.76.0-doc.tar.bz2 995143 SHA256 746b8e8092e017b8b2a32dd80981d0ff6731520f49f6b1caa60519c441809638 SHA512 cd64e1fea3f631c7c6e268d01285f96966325fd16971d8840eef178ccc11b001b40ae5cfcc6c7c3bb026a3f04c04a16b90813f0b6818383bb80686a89ea48596 WHIRLPOOL 215a8dec04a91805fe449ee99e8e210298124261258f8a92fb33850dc52695fc1215be3369de52fcb6a078baf52e1f812b4cac7d8611c3565f356d8a3f188c58
 DIST luatex-beta-0.76.0-source.tar.bz2 11748576 SHA256 71a96c927c9d9032e0126f0bc6c679191f0850a4611cd395de69e69a4d3b7716 SHA512 71ea789a95d419bf177f7f9f8d24d00a9d5639665feadac93cc30c86531e4942d29d848ef39ca3698de3efb1b8da9eb19890b1a06b45664641c7e47a79dd80b0 WHIRLPOOL abfa833b2d0457408d3a38a9229d7fd21d8380eb0743b574a318b6bea1d513e51c84367f5f773ef7c965517840735b43210d62c988bbbb6f7ec6293cdcc4e348
-EBUILD luatex-0.70.1-r2.ebuild 3779 SHA256 6944c10f427ad1a00c48e6031138a4398602e08bf38291a5ce8c54e0cf33fa4b SHA512 799953e3144333c65c140292b2d4615d55c784659d7a0f956736811cf4a7414d7ca32eaf2146a24935d725fae4bffd5b4ab6e2c8d3581caa77fd37b1eeaa8456 WHIRLPOOL 4b67b8dafba1ef1f20aac46f183d4141b96d8130ea9c27797d6f658edad6f595ffe3e387c0009f71363cc718a07c205be55ffe6600fb64b91127498bc6b16667
+EBUILD luatex-0.70.1-r2.ebuild 3875 SHA256 e16f098d72492934cc01565a83166cad041f06233943aa146a96e0e040ca26b5 SHA512 1d49dba63e3591a7e40b332919f539982de39accf2cda6ccd8d8eb631f7800b439e9f77a6ffecec99a36c2d647548f7d3b610c8b784ef98bb93fb854a87808a8 WHIRLPOOL 75a96080f4bbb18fb05d031e40d52a010a48fb406c4e6b11d9282c63ee223a7af8d26734d494172d98c90652a95d2032428aa14f6d9f2e1486f2416df96c0647
 EBUILD luatex-0.76.0.ebuild 3170 SHA256 30ff4d64fbfcaf97441934681d068afcdd8016636f6a9db1809bcdab3f61ea81 SHA512 e7231f9da5bd78d3854bed149729f7d302ed4b396abde6774cd5ff6c8e936e9380a277b69b93951ec7448f54fe84604828d62dc3c5b557cb31980b4a2af493fc WHIRLPOOL f4dd4a7ea39d6243ead185c0ce827eb5b399c1ed0554f385fca4e8b0989e35b34184ba01507866b8e69fcebcc40de0020eca4797a23002c2a3c153ab7f804d5b
-MISC ChangeLog 17687 SHA256 5889c116f2ee04dcb87f660e03b8ed4e14c3fb7ce73e56217d450ebc6939136c SHA512 5cf9a56e361217ee75641eba536aaf65546fa736def9d36693d11cc5f1559175d3c36fc1830ae53af78b9e82f6b339a270e02ca28c2837fb668daccfa8e71b45 WHIRLPOOL 2f2f84775745f169334d0a2d0472903c4f80d18281d7b9602539d806b02f015117571dc179de4458e7b5da73134cfcd69b64b8bb857fcf012ed6293c734830c1
+MISC ChangeLog 17899 SHA256 c98a0b50b0350b4cc3aa9e47beec0ca8c64a1d113c7a4a598266914dc8457ec5 SHA512 6b624b9f2a6fe8c8b007618b0af5960565bf430af5a2630e5e97f1cfe0ce64faabbfdc6531eda8f3b0b35931108d1317da716d1eaea6fb689b1387b222cc1411 WHIRLPOOL b00c653fbf6ca68dd75b6b20cdfd357b3c2dc6890f034c95730384e24a2ceaa0a5efad33b6f6b49c671542276d287852a97ed6d45335b21e97f2879c47a81a0a
 MISC metadata.xml 336 SHA256 126018a4822f911e52afe63656a10f2a7b0b938ea106f2a2caef00bdc18a845f SHA512 d998dbfe23cbb7f60db7b876e8ac3d039281ad9568aeb45a494774eb65468392523cdfc1b5cc8b621fc9a2f2f7f33dc3e351d1cf902f9ecf3f122534ef4767e0 WHIRLPOOL 3350c9964adc178cb58ee77019669fa51899cd71734ae1ff8f4646d1f9e141973c9f686f43e5995f1a7258d92bd173176dc0d9c3d8bcc09b96c37a0b7a0fb4a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn47QACgkQcaHudmEf86q1JwCdGHG7R8gmG9e7CqfeE5Etbv3i
-+NcAniouGq6Z+cIqBl58Kq2PXGK1pNvw
-=/wlP
+iQJ8BAEBCABmBQJUOQrpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcD4AQAMj3+baL9oHMhHVf7yrzdqDY
+EQz1SJrcbALfslKtgad3x4N690YAoYpMo4fmi3P3b+jtCAEPdrFZGomB/gzkIJx/
+cQKbC/G54jRgyB3W4YNminSt51JR9SQqYshov5UoupFU77MSYKwmOnMkGF/NGKKA
+3Te1h4XETxo/d+1NLxDHFIeZIf+JVQylZs8i3xQh2e4xEGxKqmddw10zJI3lyaRn
+yLFTFpeROkPQBqdg+/mLt49LUwBDA9FUa47UFHB1/y40o6IqDlnTUMQO+DAcsOiO
+SUWCnNTVOwyJ318HMv2hu9ty3DIF8kMBjXEmQBr9mZM9Nt8p0PCuQW5LR/n4TzUU
+dCu+hj/FQ1joHFkInFGsBxuAQONalSNvW2mg7AOnsfwmcN48k9A6/bJU+SOJIHbR
+ICyBU9FlGrZYRGiGWPu6baUJSuxa1Ms/ptHKbe032XOgVnJs0YP4HzkJrCPWz2lf
+oGDMguuvQrvbBEW8MGoJWPr1UquP4Tl1EtO4ScuzxHCdprNFzLYX7kC8mXyK7xR6
+plVSa+cQgt7G1sDT1ma99b2oO+lV0/+ctuq8xBnyYMlzGxsCNjJNw5CQr2eetajA
+RMYQQQZk3jlATqV/WsKYFHcpD6YWn6qTu6S7ccd50CtipMAY7iFdVl4C6vZzpwzZ
+HUNph/m+vxG9dL3wygoa
+=gpPd
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/luatex/files/poppler026-backport.patch b/dev-tex/luatex/files/poppler026-backport.patch
new file mode 100644
index 000000000000..ee151a30b47f
--- /dev/null
+++ b/dev-tex/luatex/files/poppler026-backport.patch
@@ -0,0 +1,99 @@
+diff -ruN luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/image/epdf.h luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/image/epdf.h
+--- luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/image/epdf.h	2011-05-19 07:38:37.000000000 +0200
++++ luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/image/epdf.h	2014-10-11 12:17:00.028331243 +0200
+@@ -33,6 +33,7 @@
+ #  include <sys/stat.h>
+ #  include <dirent.h>
+ #  include <poppler-config.h>
++#  include <StructTreeRoot.h>
+ #  include <goo/GooString.h>
+ #  include <goo/gmem.h>
+ #  include <goo/gfile.h>
+diff -ruN luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/lua/lepdflib.cc luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/lua/lepdflib.cc
+--- luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/lua/lepdflib.cc	2014-10-11 12:24:52.509357663 +0200
++++ luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/lua/lepdflib.cc	2014-10-11 12:42:03.665415321 +0200
+@@ -48,23 +48,24 @@
+ 
+ //**********************************************************************
+ 
+-#define M_Annot            "Annot"
+-#define M_Annots           "Annots"
+-#define M_Array            "Array"
+-#define M_Catalog          "Catalog"
+-#define M_Dict             "Dict"
+-#define M_GooString        "GooString"
+-#define M_LinkDest         "LinkDest"
+-#define M_Link             "Link"
+-#define M_Links            "Links"
+-#define M_Object           "Object"
+-#define M_Page             "Page"
+-#define M_PDFDoc           "PDFDoc"
+-#define M_PDFRectangle     "PDFRectangle"
+-#define M_Ref              "Ref"
+-#define M_Stream           "Stream"
+-#define M_XRefEntry        "XRefEntry"
+-#define M_XRef             "XRef"
++#define M_Annot            "epdf.Annot" /* ls-hh: epdf.* gives better protection in registry */
++#define M_Annots           "epdf.Annots"
++#define M_Array            "epdf.Array"
++#define M_Catalog          "epdf.Catalog"
++#define M_Dict             "epdf.Dict"
++#define M_GooString        "epdf.GooString"
++#define M_LinkDest         "epdf.LinkDest"
++#define M_Link             "epdf.Link"
++#define M_Links            "epdf.Links"
++#define M_Object           "epdf.Object"
++#define M_Page             "epdf.Page"
++#define M_PDFDoc           "epdf.PDFDoc"
++#define M_PDFRectangle     "epdf.PDFRectangle"
++#define M_Ref              "epdf.Ref"
++#define M_Stream           "epdf.Stream"
++#define M_StructTreeRoot   "epdf.StructTreeRoot"
++#define M_XRef             "epdf.XRef"
++#define M_XRefEntry        "epdf.XRefEntry"
+ 
+ //**********************************************************************
+ 
+@@ -92,6 +93,7 @@
+ new_poppler_userdata(PDFRectangle);
+ new_poppler_userdata(Ref);
+ new_poppler_userdata(Stream);
++new_poppler_userdata(StructTreeRoot);
+ new_poppler_userdata(XRef);
+ 
+ //**********************************************************************
+@@ -565,7 +567,11 @@
+ 
+ m_poppler_get_GOOSTRING(Catalog, getBaseURI);
+ m_poppler_get_GOOSTRING(Catalog, readMetadata);
++#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
+ m_poppler_get_poppler(Catalog, Object, getStructTreeRoot);
++#else
++m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot);
++#endif
+ 
+ static int m_Catalog_findPage(lua_State * L)
+ {
+@@ -2048,14 +2054,22 @@
+ 
+ static int m_PDFDoc_getStructTreeRoot(lua_State * L)
+ {
++#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
+     Object *obj;
++#else
++    StructTreeRoot *obj;
++#endif
+     udstruct *uin, *uout;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+         pdfdoc_changed_error(L);
+     if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
+         obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
++#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
+         uout = new_Object_userdata(L);
++#else
++        uout = new_StructTreeRoot_userdata(L);
++#endif
+         uout->d = obj;
+         uout->pc = uin->pc;
+         uout->pd = uin->pd;
diff --git a/dev-tex/luatex/luatex-0.70.1-r2.ebuild b/dev-tex/luatex/luatex-0.70.1-r2.ebuild
index 08dddd02ca6a..952ef7837143 100644
--- a/dev-tex/luatex/luatex-0.70.1-r2.ebuild
+++ b/dev-tex/luatex/luatex-0.70.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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-r2.ebuild,v 1.13 2014/08/10 21:27:15 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.70.1-r2.ebuild,v 1.14 2014/10/11 10:48:02 dilfridge Exp $
 
 EAPI=5
 
@@ -33,6 +33,7 @@ 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"
 	has_version '>=app-text/poppler-0.22.0:0' && epatch "${FILESDIR}/poppler022.patch"
+	has_version '>=app-text/poppler-0.26.0:0' && epatch "${FILESDIR}/poppler026-backport.patch"
 	epatch "${FILESDIR}/kpathsea2012.patch" \
 		"${FILESDIR}/remove-zlib-version-check.patch"
 	S="${S}/build-aux" elibtoolize --shallow