diff options
author | ryoon <ryoon@pkgsrc.org> | 2018-04-29 20:57:26 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2018-04-29 20:57:26 +0000 |
commit | 3f5c6053fb999c56b5fa404739373e3156e6250a (patch) | |
tree | 3d9f7d9677c554a3b2423ca7574717220644f759 /print/luatex | |
parent | e0c86ece02618d222015abe475e61575d8e5c49d (diff) | |
download | pkgsrc-3f5c6053fb999c56b5fa404739373e3156e6250a.tar.gz |
Fix build with poppler 0.64.0
Diffstat (limited to 'print/luatex')
-rw-r--r-- | print/luatex/distinfo | 6 | ||||
-rw-r--r-- | print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w | 15 | ||||
-rw-r--r-- | print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc | 42 |
3 files changed, 47 insertions, 16 deletions
diff --git a/print/luatex/distinfo b/print/luatex/distinfo index d34f2ecbe3d..d2abf77a340 100644 --- a/print/luatex/distinfo +++ b/print/luatex/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.28 2017/12/31 00:41:19 markd Exp $ +$NetBSD: distinfo,v 1.29 2018/04/29 20:57:26 ryoon Exp $ SHA1 (texlive-20170524-source.tar.xz) = 1c1383ddb1b871c6b8ce49a4ae3c1a33d454a7b6 RMD160 (texlive-20170524-source.tar.xz) = a8430c19fe1727cf308fe03e5838105260c0d71e @@ -7,8 +7,8 @@ Size (texlive-20170524-source.tar.xz) = 63483372 bytes SHA1 (patch-ac) = 1ee83833a03eace2eada892130ddb2198e829f3d SHA1 (patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c) = 34fa742ed696f97df637c5086bf1faf3d718cb69 SHA1 (patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc) = 491d33adbbaab8b2b81a65a8d7ba30aee775b75f -SHA1 (patch-texk_web2c_luatexdir_image_pdftoepdf.w) = 7ce1ce5fd8cb277229d43c1408d34189ae741657 -SHA1 (patch-texk_web2c_luatexdir_lua_lepdflib.cc) = 2077e2f681d63d48b54eac5ef9751447dcc3ea8f +SHA1 (patch-texk_web2c_luatexdir_image_pdftoepdf.w) = ef0950aeeba70fdb286835dd5eab85555fd1131a +SHA1 (patch-texk_web2c_luatexdir_lua_lepdflib.cc) = 0758888fd2bf23e339a858fdde84c0aa111a7350 SHA1 (patch-texk_web2c_luatexdir_lua_lpdfscannerlib.cc) = ddb11816de22cc7b3f286b3a7838dcf6debbf892 SHA1 (patch-texk_web2c_luatexdir_luaffi_ctype.c) = 57d51564d5dd0200be10154216158fe801d7c630 SHA1 (patch-texk_web2c_luatexdir_luaffi_ffi.h) = 2fbf91152fc3438d8e989d5f5f95877faaec6790 diff --git a/print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w b/print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w index a2f1e5e30e6..d1f3561de39 100644 --- a/print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w +++ b/print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w @@ -1,4 +1,4 @@ -$NetBSD: patch-texk_web2c_luatexdir_image_pdftoepdf.w,v 1.3 2017/12/31 00:41:19 markd Exp $ +$NetBSD: patch-texk_web2c_luatexdir_image_pdftoepdf.w,v 1.4 2018/04/29 20:57:26 ryoon Exp $ The ctangle tex-to-C generator strips whitespace, resulting in "C++11 requires a space between literal and identifier" failures. Pull in hacky patch from @@ -52,6 +52,19 @@ Add support for newer poppler's from ArchLinux } pdf_end_dict(pdf); } +@@ -470,10 +472,10 @@ static void copyObject(PDF pdf, PdfDocum + break; + */ + case objString: +- copyString(pdf, obj->getString()); ++ copyString(pdf, const_cast<GooString*>(obj->getString())); + break; + case objName: +- copyName(pdf, obj->getName()); ++ copyName(pdf, const_cast<char*>(obj->getName())); + break; + case objNull: + pdf_add_null(pdf); @@ -510,13 +512,12 @@ static void writeRefs(PDF pdf, PdfDocume PDFDoc *doc = pdf_doc->doc; xref = doc->getXRef(); diff --git a/print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc b/print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc index 6f4d6cd1397..87608e3e464 100644 --- a/print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc +++ b/print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc @@ -1,9 +1,18 @@ -$NetBSD: patch-texk_web2c_luatexdir_lua_lepdflib.cc,v 1.3 2017/12/31 00:41:19 markd Exp $ +$NetBSD: patch-texk_web2c_luatexdir_lua_lepdflib.cc,v 1.4 2018/04/29 20:57:26 ryoon Exp $ Add support for newer poppler's from ArchLinux --- texk/web2c/luatexdir/lua/lepdflib.cc.orig 2017-03-11 01:04:06.000000000 +0000 +++ texk/web2c/luatexdir/lua/lepdflib.cc +@@ -521,7 +521,7 @@ static int m_##in##_##function(lua_State + uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \ + if (uin->pd != NULL && uin->pd->pc != uin->pc) \ + pdfdoc_changed_error(L); \ +- gs = ((in *) uin->d)->function(); \ ++ gs = const_cast<GooString*>(((in *) uin->d)->function()); \ + if (gs != NULL) \ + lua_pushlstring(L, gs->getCString(), gs->getLength()); \ + else \ @@ -538,7 +538,7 @@ static int m_##in##_##function(lua_State pdfdoc_changed_error(L); \ uout = new_Object_userdata(L); \ @@ -13,7 +22,7 @@ Add support for newer poppler's from ArchLinux uout->atype = ALLOC_LEPDF; \ uout->pc = uin->pc; \ uout->pd = uin->pd; \ -@@ -668,13 +668,11 @@ static const struct luaL_Reg Annots_m[] +@@ -668,13 +668,11 @@ static const struct luaL_Reg Annots_m[] static int m_Array_incRef(lua_State * L) { @@ -159,7 +168,7 @@ Add support for newer poppler's from ArchLinux return 0; } -@@ -1395,7 +1388,7 @@ static int m_Object_initInt(lua_State * +@@ -1395,7 +1388,7 @@ static int m_Object_initInt(lua_State * if (uin->pd != NULL && uin->pd->pc != uin->pc) pdfdoc_changed_error(L); i = luaL_checkint(L, 2); @@ -211,7 +220,7 @@ Add support for newer poppler's from ArchLinux uin = (udstruct *) luaL_checkudata(L, 1, M_Object); uxref = (udstruct *) luaL_checkudata(L, 2, M_XRef); if (uin->pd != NULL && uxref->pd != NULL && uin->pd != uxref->pd) -@@ -1458,7 +1452,8 @@ static int m_Object_initArray(lua_State +@@ -1458,7 +1452,8 @@ static int m_Object_initArray(lua_State if ((uin->pd != NULL && uin->pd->pc != uin->pc) || (uxref->pd != NULL && uxref->pd->pc != uxref->pc)) pdfdoc_changed_error(L); @@ -221,7 +230,7 @@ Add support for newer poppler's from ArchLinux return 0; } -@@ -1469,6 +1464,7 @@ static int m_Object_initArray(lua_State +@@ -1469,6 +1464,7 @@ static int m_Object_initArray(lua_State static int m_Object_initDict(lua_State * L) { udstruct *uin, *uxref; @@ -248,7 +257,7 @@ Add support for newer poppler's from ArchLinux return 0; } -@@ -1503,7 +1500,7 @@ static int m_Object_initRef(lua_State * +@@ -1503,7 +1500,7 @@ static int m_Object_initRef(lua_State * pdfdoc_changed_error(L); num = luaL_checkint(L, 2); gen = luaL_checkint(L, 3); @@ -257,7 +266,7 @@ Add support for newer poppler's from ArchLinux return 0; } -@@ -1515,7 +1512,7 @@ static int m_Object_initCmd(lua_State * +@@ -1515,7 +1512,7 @@ static int m_Object_initCmd(lua_State * if (uin->pd != NULL && uin->pd->pc != uin->pc) pdfdoc_changed_error(L); s = luaL_checkstring(L, 2); @@ -266,7 +275,7 @@ Add support for newer poppler's from ArchLinux return 0; } -@@ -1525,7 +1522,7 @@ static int m_Object_initError(lua_State +@@ -1525,7 +1522,7 @@ static int m_Object_initError(lua_State uin = (udstruct *) luaL_checkudata(L, 1, M_Object); if (uin->pd != NULL && uin->pd->pc != uin->pc) pdfdoc_changed_error(L); @@ -275,7 +284,7 @@ Add support for newer poppler's from ArchLinux return 0; } -@@ -1535,7 +1532,7 @@ static int m_Object_initEOF(lua_State * +@@ -1535,7 +1532,7 @@ static int m_Object_initEOF(lua_State * uin = (udstruct *) luaL_checkudata(L, 1, M_Object); if (uin->pd != NULL && uin->pd->pc != uin->pc) pdfdoc_changed_error(L); @@ -293,6 +302,15 @@ Add support for newer poppler's from ArchLinux uout->atype = ALLOC_LEPDF; uout->pc = uin->pc; uout->pd = uin->pd; +@@ -1659,7 +1656,7 @@ static int m_Object_getString(lua_State + if (uin->pd != NULL && uin->pd->pc != uin->pc) + pdfdoc_changed_error(L); + if (((Object *) uin->d)->isString()) { +- gs = ((Object *) uin->d)->getString(); ++ gs = const_cast<GooString*>(((Object *) uin->d)->getString()); + lua_pushlstring(L, gs->getCString(), gs->getLength()); + } else + lua_pushnil(L); @@ -1816,7 +1813,7 @@ static int m_Object_arrayAdd(lua_State * pdfdoc_changed_error(L); if (!((Object *) uin->d)->isArray()) @@ -320,7 +338,7 @@ Add support for newer poppler's from ArchLinux uout->atype = ALLOC_LEPDF; uout->pc = uin->pc; uout->pd = uin->pd; -@@ -1897,7 +1894,7 @@ static int m_Object_dictAdd(lua_State * +@@ -1897,7 +1894,7 @@ static int m_Object_dictAdd(lua_State * pdfdoc_changed_error(L); if (!((Object *) uin->d)->isDict()) luaL_error(L, "Object is not a Dict"); @@ -329,7 +347,7 @@ Add support for newer poppler's from ArchLinux return 0; } -@@ -1915,7 +1912,7 @@ static int m_Object_dictSet(lua_State * +@@ -1915,7 +1912,7 @@ static int m_Object_dictSet(lua_State * pdfdoc_changed_error(L); if (!((Object *) uin->d)->isDict()) luaL_error(L, "Object is not a Dict"); @@ -383,7 +401,7 @@ Add support for newer poppler's from ArchLinux m_poppler_get_OBJECT(Page, getContents); -@@ -2270,7 +2267,7 @@ static const struct luaL_Reg Page_m[] = +@@ -2270,7 +2267,7 @@ static const struct luaL_Reg Page_m[] = {"getPieceInfo", m_Page_getPieceInfo}, {"getSeparationInfo", m_Page_getSeparationInfo}, {"getResourceDict", m_Page_getResourceDict}, |