 @@ -1,29 +1,38 @@
-$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);                             \
      uout->d = new Object();                                    \
 -    ((in *) uin->d)->function((Object *) uout->d);             \
 +    *((Object *)uout->d) = ((in *) uin->d)->function();                  \
      uout->atype = ALLOC_LEPDF;                                 \
      uout->pc = uin->pc;                                        \
      uout->pd = uin->pd;                                        \
 @@ -668,13 +668,11 @@ static const struct luaL_Reg Annots_m[]
  static int m_Array_incRef(lua_State * L)
+ {
 -    int i;
      udstruct *uin;
      uin = (udstruct *) luaL_checkudata(L, 1, M_Array);
      if (uin->pd != NULL && uin->pd->pc != uin->pc)
          pdfdoc_changed_error(L);
 -    i = ((Array *) uin->d)->incRef();
 -    lua_pushinteger(L, i);
 +    lua_pushinteger(L, 1);
      return 1;
+ }
 @@ -149,27 +158,27 @@ Add support for newer poppler's from Arc
          uout->pd = uin->pd;
 @@ -1381,9 +1374,9 @@ static int m_Object_initBool(lua_State *
          pdfdoc_changed_error(L);
      luaL_checktype(L, 2, LUA_TBOOLEAN);
      if (lua_toboolean(L, 2) != 0)
 -        ((Object *) uin->d)->initBool(gTrue);
 +        *((Object *) uin->d) = Object(gTrue);
      else
 -        ((Object *) uin->d)->initBool(gFalse);
 +        *((Object *) uin->d) = Object(gFalse);
      return 0;
+ }
 @@ -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);
 -    ((Object *) uin->d)->initInt(i);
 +    *((Object *) uin->d) = Object(i);
      return 0;
+ }
 @@ -1407,7 +1400,7 @@ static int m_Object_initReal(lua_State *
      if (uin->pd != NULL && uin->pd->pc != uin->pc)
          pdfdoc_changed_error(L);
      d = luaL_checknumber(L, 2);
 -    ((Object *) uin->d)->initReal(d);
 @@ -201,108 +210,117 @@ Add support for newer poppler's from Arc
          pdfdoc_changed_error(L);
 -    ((Object *) uin->d)->initNull();
 +    *((Object *) uin->d) = Object(objNull);
      return 0;
+ }
  static int m_Object_initArray(lua_State * L)
+ {
      udstruct *uin, *uxref;
 +    Array *a;
      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
      if ((uin->pd != NULL && uin->pd->pc != uin->pc)
          || (uxref->pd != NULL && uxref->pd->pc != uxref->pc))
          pdfdoc_changed_error(L);
 -    ((Object *) uin->d)->initArray((XRef *) uxref->d);
 +    a = new Array((XRef *) uxref->d);
 +    *((Object *) uin->d) = Object(a);
      return 0;
+ }
 @@ -1469,6 +1464,7 @@ static int m_Object_initArray(lua_State
  static int m_Object_initDict(lua_State * L)
+ {
      udstruct *uin, *uxref;
 +    Dict *d;
      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)
 @@ -1476,7 +1472,8 @@ static int m_Object_initDict(lua_State *
      if ((uin->pd != NULL && uin->pd->pc != uin->pc)
          || (uxref->pd != NULL && uxref->pd->pc != uxref->pc))
          pdfdoc_changed_error(L);
 -    ((Object *) uin->d)->initDict((XRef *) uxref->d);
 +    d = new Dict((XRef *) uxref->d);
 +    *((Object *) uin->d) = Object(d);
      return 0;
+ }
 @@ -1490,7 +1487,7 @@ static int m_Object_initStream(lua_State
      if ((uin->pd != NULL && uin->pd->pc != uin->pc)
          || (ustream->pd != NULL && ustream->pd->pc != ustream->pc))
          pdfdoc_changed_error(L);
 -    ((Object *) uin->d)->initStream((Stream *) ustream->d);
 +    *((Object *) uin->d) = Object((Stream *) ustream->d);
      return 0;
+ }
 @@ -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);
 -    ((Object *) uin->d)->initRef(num, gen);
 +    *((Object *) uin->d) = Object(num, gen);
      return 0;
+ }
 @@ -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);
 -    ((Object *) uin->d)->initCmd(CHARP_CAST s);
 +    *((Object *) uin->d) = Object(objCmd, CHARP_CAST s);
      return 0;
+ }
 @@ -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);
 -    ((Object *) uin->d)->initError();
 +    *((Object *) uin->d) = Object(objError);
      return 0;
+ }
 @@ -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);
 -    ((Object *) uin->d)->initEOF();
 +    *((Object *) uin->d) = Object(objEOF);
      return 0;
+ }
 @@ -1551,7 +1548,7 @@ static int m_Object_fetch(lua_State * L)
          pdfdoc_changed_error(L);
      uout = new_Object_userdata(L);
      uout->d = new Object();
 -    ((Object *) uin->d)->fetch((XRef *) uxref->d, (Object *) uout->d);
 +    *((Object *) uout->d) = ((Object *) uin->d)->fetch((XRef *) uxref->d);
      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())
          luaL_error(L, "Object is not an Array");
 -    ((Object *) uin->d)->arrayAdd((Object *) uobj->d);
 +    ((Object *) uin->d)->arrayAdd(std::move(*((Object *) uobj->d)));
      return 0;
+ }
 @@ -1833,7 +1830,7 @@ static int m_Object_arrayGet(lua_State *
          if (i > 0 && i <= len) {
              uout = new_Object_userdata(L);
              uout->d = new Object();
 @@ -310,36 +328,36 @@ Add support for newer poppler's from Arc
 +            *((Object *) uout->d) = ((Object *) uin->d)->arrayGet(i - 1);
              uout->atype = ALLOC_LEPDF;
              uout->pc = uin->pc;
              uout->pd = uin->pd;
 @@ -1857,7 +1854,7 @@ static int m_Object_arrayGetNF(lua_State
          if (i > 0 && i <= len) {
              uout = new_Object_userdata(L);
              uout->d = new Object();
 -            ((Object *) uin->d)->arrayGetNF(i - 1, (Object *) uout->d);
 +            *((Object *) uout->d) = ((Object *) uin->d)->arrayGetNF(i - 1);
              uout->atype = ALLOC_LEPDF;
              uout->pc = uin->pc;
              uout->pd = uin->pd;
 @@ -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");
 -    ((Object *) uin->d)->dictAdd(copyString(s), (Object *) uobj->d);
 +    ((Object *) uin->d)->dictAdd(copyString(s), std::move(*((Object *) uobj->d)));
      return 0;
+ }
 @@ -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");
 -    ((Object *) uin->d)->dictSet(s, (Object *) uobj->d);
 +    ((Object *) uin->d)->dictSet(s, std::move(*((Object *) uobj->d)));
      return 0;
+ }
 @@ -1930,7 +1927,7 @@ static int m_Object_dictLookup(lua_State
      if (((Object *) uin->d)->isDict()) {
          uout = new_Object_userdata(L);
          uout->d = new Object();
 -        ((Object *) uin->d)->dictLookup(s, (Object *) uout->d);
 @@ -373,27 +391,27 @@ Add support for newer poppler's from Arc
 +            *((Object *) uout->d) = ((Object *) uin->d)->dictGetValNF(i - 1);
              uout->atype = ALLOC_LEPDF;
              uout->pc = uin->pc;
              uout->pd = uin->pd;
 @@ -2243,7 +2240,7 @@ m_poppler_get_poppler(Page, Stream, getM
  m_poppler_get_poppler(Page, Dict, getPieceInfo);
  m_poppler_get_poppler(Page, Dict, getSeparationInfo);
  m_poppler_get_poppler(Page, Dict, getResourceDict);
 -m_poppler_get_OBJECT(Page, getAnnots);
 +m_poppler_get_OBJECT(Page, getAnnotsObject);
  m_poppler_get_OBJECT(Page, getContents);
 @@ -2270,7 +2267,7 @@ static const struct luaL_Reg Page_m[] =
      {"getPieceInfo", m_Page_getPieceInfo},
      {"getSeparationInfo", m_Page_getSeparationInfo},
      {"getResourceDict", m_Page_getResourceDict},
 -    {"getAnnots", m_Page_getAnnots},
 +    {"getAnnots", m_Page_getAnnotsObject},
      {"getContents", m_Page_getContents},
      {"__tostring", m_Page__tostring},
      {NULL, NULL}                // sentinel
 @@ -2520,7 +2517,7 @@ static int m_PDFDoc_getDocInfo(lua_State
      if (((PdfDocument *) uin->d)->doc->getXRef()->isOk()) {
          uout = new_Object_userdata(L);
          uout->d = new Object();
 -        ((PdfDocument *) uin->d)->doc->getDocInfo((Object *) uout->d);

 @@ -1,14 +1,14 @@
-$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
 SHA512 (texlive-20170524-source.tar.xz) = 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 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_image_pdftoepdf.w) = ef0950aeeba70fdb286835dd5eab85555fd1131a
-SHA1 (patch-texk_web2c_luatexdir_lua_lepdflib.cc) = 2077e2f681d63d48b54eac5ef9751447dcc3ea8f
+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

 @@ -1,14 +1,14 @@
-$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
 Gentoo which avoids this problem by using newlines.
 Add support for newer poppler's from ArchLinux
 --- texk/web2c/luatexdir/image/pdftoepdf.w.orig	2016-11-25 18:09:14.000000000 +0000
 +++ texk/web2c/luatexdir/image/pdftoepdf.w
 @@ -71,7 +71,11 @@ static char *get_file_checksum(const cha
          ck = (char *) malloc(PDF_CHECKSUM_SIZE);
          if (ck == NULL)
              formatted_error("pdf inclusion","out of memory while processing '%s'", a);
 @@ -42,26 +42,39 @@ Add support for newer poppler's from Arc
      pdf_end_array(pdf);
+ }
 @@ -422,9 +425,8 @@ static void copyDict(PDF pdf, PdfDocumen
      pdf_begin_dict(pdf);
      for (i = 0, l = dict->getLength(); i < l; ++i) {
          copyName(pdf, dict->getKey(i));
 -        dict->getValNF(i, &obj1);
 +        obj1 = dict->getValNF(i);
          copyObject(pdf, pdf_doc, &obj1);
 -        obj1.free();
+     }
      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();
      for (r = pdf_doc->inObjList; r != NULL;) {
 -        xref->fetch(r->ref.num, r->ref.gen, &obj1);
 +        obj1 = xref->fetch(r->ref.num, r->ref.gen);
          if (obj1.isStream())
              pdf_begin_obj(pdf, r->num, OBJSTM_NEVER);
          else
              pdf_begin_obj(pdf, r->num, 2);
          copyObject(pdf, pdf_doc, &obj1);
 -        obj1.free();
          pdf_end_obj(pdf);