texlive-bin-2018.47465-4.par1: icu 63.1 / poppler 0.70.0 rebuild

1 files changed, 122 insertions, 0 deletions

diff --git a/libre/texlive-bin/luatex-poppler-0.70-const-fixes.patch b/libre/texlive-bin/luatex-poppler-0.70-const-fixes.patch
new file mode 100644
index 000000000..09789f634
--- /dev/null
+++ b/libre/texlive-bin/luatex-poppler-0.70-const-fixes.patch
@@ -0,0 +1,122 @@
+diff -upr source.orig/texk/web2c/luatexdir/image/pdftoepdf.w source/texk/web2c/luatexdir/image/pdftoepdf.w
+--- source.orig/texk/web2c/luatexdir/image/pdftoepdf.w	2018-10-28 14:14:32.961111369 +0200
++++ source/texk/web2c/luatexdir/image/pdftoepdf.w	2018-10-28 14:24:21.735889333 +0200
+@@ -363,7 +363,7 @@ void copyReal(PDF pdf, double d)
+ 
+ static void copyString(PDF pdf, GooString * string)
+ {
+-    char *p;
++    const char *p;
+     unsigned char c;
+     size_t i, l;
+     p = string->getCString();
+@@ -393,7 +393,7 @@ static void copyString(PDF pdf, GooStrin
+     pdf->cave = true;
+ }
+ 
+-static void copyName(PDF pdf, char *s)
++static void copyName(PDF pdf, const char *s)
+ {
+     pdf_out(pdf, '/');
+     for (; *s != 0; s++) {
+@@ -475,7 +475,7 @@ static void copyObject(PDF pdf, PdfDocum
+         copyString(pdf, (GooString *)obj->getString());
+         break;
+     case objName:
+-        copyName(pdf, (char *)obj->getName());
++        copyName(pdf, obj->getName());
+         break;
+     case objNull:
+         pdf_add_null(pdf);
+@@ -531,22 +531,22 @@ static PDFRectangle *get_pagebox(Page *
+ {
+     switch (pagebox_spec) {
+         case PDF_BOX_SPEC_MEDIA:
+-            return page->getMediaBox();
++            return (PDFRectangle *) page->getMediaBox();
+             break;
+         case PDF_BOX_SPEC_CROP:
+-            return page->getCropBox();
++            return (PDFRectangle *) page->getCropBox();
+             break;
+         case PDF_BOX_SPEC_BLEED:
+-            return page->getBleedBox();
++            return (PDFRectangle *) page->getBleedBox();
+             break;
+         case PDF_BOX_SPEC_TRIM:
+-            return page->getTrimBox();
++            return (PDFRectangle *) page->getTrimBox();
+             break;
+         case PDF_BOX_SPEC_ART:
+-            return page->getArtBox();
++            return (PDFRectangle *) page->getArtBox();
+             break;
+         default:
+-            return page->getMediaBox();
++            return (PDFRectangle *) page->getMediaBox();
+             break;
+     }
+ }
+diff -upr source.orig/texk/web2c/luatexdir/lua/lepdflib.cc source/texk/web2c/luatexdir/lua/lepdflib.cc
+--- source.orig/texk/web2c/luatexdir/lua/lepdflib.cc	2018-10-28 14:14:32.961111369 +0200
++++ source/texk/web2c/luatexdir/lua/lepdflib.cc	2018-10-28 14:19:28.093424519 +0200
+@@ -596,7 +596,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);                               \
+-    o = ((in *) uin->d)->function();                           \
++    o = (out *) ((in *) uin->d)->function();                           \
+     if (o != NULL) {                                           \
+         uout = new_##out##_userdata(L);                        \
+         uout->d = o;                                           \
+@@ -1125,12 +1125,12 @@ m_poppler_get_INT(Dict, getLength);
+ 
+ static int m_Dict_add(lua_State * L)
+ {
+-    char *s;
++    const char *s;
+     udstruct *uin, *uobj;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_Dict);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+         pdfdoc_changed_error(L);
+-    s = copyString(luaL_checkstring(L, 2));
++    s = luaL_checkstring(L, 2);
+     uobj = (udstruct *) luaL_checkudata(L, 3, M_Object);
+     ((Dict *) uin->d)->add(s, std::move(*((Object *) uobj->d)));
+     return 0;
+@@ -2051,7 +2051,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), std::move(*((Object *) uobj->d)));
++    ((Object *) uin->d)->dictAdd(s, std::move(*((Object *) uobj->d)));
+     return 0;
+ }
+ 
+@@ -2470,7 +2470,7 @@ static int m_PDFDoc_getFileName(lua_Stat
+     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+         pdfdoc_changed_error(L);
+-    gs = ((PdfDocument *) uin->d)->doc->getFileName();
++    gs = (GooString *) ((PdfDocument *) uin->d)->doc->getFileName();
+     if (gs != NULL)
+         lua_pushlstring(L, gs->getCString(), gs->getLength());
+     else
+@@ -2559,7 +2559,7 @@ static int m_PDFDoc_readMetadata(lua_Sta
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+         pdfdoc_changed_error(L);
+     if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
+-        gs = ((PdfDocument *) uin->d)->doc->readMetadata();
++        gs = (GooString *) ((PdfDocument *) uin->d)->doc->readMetadata();
+         if (gs != NULL)
+             lua_pushlstring(L, gs->getCString(), gs->getLength());
+         else
+@@ -2577,7 +2577,7 @@ static int m_PDFDoc_getStructTreeRoot(lu
+     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();
++        obj = (StructTreeRoot *) ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
+         uout = new_StructTreeRoot_userdata(L);
+         uout->d = obj;
+         uout->pc = uin->pc;