Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (bdb216133de4adf355f102aef552f8b65275540f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (bdb216133de4adf355f102aef552f8b65275540f)
  • Date: Wed, 5 Dec 2018 23:48:39 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

latex/texlive/DEPENDS | 1
latex/texlive/HISTORY | 6
latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch | 91
++++++++--
latex/texlive/patches/texlive-20180414-source-upstream_fixes-2.patch | 10 -
4 files changed, 88 insertions(+), 20 deletions(-)

New commits:
commit bdb216133de4adf355f102aef552f8b65275540f
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

latex/texlive: fixed luatex

commit 6af03700d70a93b7069e01e274f36c991ec849f0
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

latex/texlive: fixed building with poppler scm branch

diff --git a/latex/texlive/DEPENDS b/latex/texlive/DEPENDS
index 5ad1918..49fb739 100755
--- a/latex/texlive/DEPENDS
+++ b/latex/texlive/DEPENDS
@@ -44,7 +44,6 @@ runtime_depends dvipng '--disable-dvipng' &&
runtime_depends lacheck '--disable-lacheck' &&
runtime_depends lcdf-typetools '--disable-lcdf-typetools' &&
# FIXME LUA and luajit dependencies aren't actually used, see PRE_BUILD
-message "${MESSAGE_COLOR}Luatex build is broken with poppler 0.71 (fix in
texlive 2019?).$DEFAULT_COLOR" &&
optional_depends LUA \
'--enable-luatex' \
'--disable-luatex' \
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index 07924eb..09a0da5 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,3 +1,9 @@
+2018-12-05 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS, patches/texlive-20180414-source-upstream_fixes-1.patch:
+ fixed luatex
+ * patches/texlive-20180414-source-upstream_fixes-2.patch: fixed for
+ poppler scm branch
+
2018-12-05 Thomas Orgis <sobukus AT sourcemage.org>
* patches/texlive-20180414-source-upstream_fixes-2.patch,
patches/texlive-20180414-source-upstream_fixes-1.patch
diff --git
a/latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch
b/latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch
index 38091a1..fed7774 100644
--- a/latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch
+++ b/latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch
@@ -58,6 +58,15 @@ diff -Naur a/texk/web2c/luatexdir/image/pdftoepdf.w
b/texk/web2c/luatexdir/image

/* Maintain AVL tree of all PDF files for embedding */

+@@ -366,7 +366,7 @@
+ char *p;
+ unsigned char c;
+ size_t i, l;
+- p = string->getCString();
++ p = string->c_str();
+ l = (size_t) string->getLength();
+ if (pdf->cave)
+ pdf_out(pdf, ' ');
@@ -468,14 +468,14 @@
break;
/*
@@ -126,7 +135,7 @@ diff -Naur a/texk/web2c/luatexdir/lua/lepdflib.cc
b/texk/web2c/luatexdir/lua/lep
uout->atype = ALLOC_LEPDF;
uout->pc = uobj->pc;
uout->pd = uobj->pd;
-@@ -439,7 +439,7 @@
+@@ -439,7 +437,7 @@
break;
case 1:
if (lua_isboolean (L,1)) {
@@ -135,16 +144,37 @@ diff -Naur a/texk/web2c/luatexdir/lua/lepdflib.cc
b/texk/web2c/luatexdir/lua/lep
uout->atype = ALLOC_LEPDF;
uout->pc = 0;
uout->pd = NULL;
-@@ -674,7 +674,7 @@
+@@ -674,9 +672,9 @@
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 = (GooString *)((in *) uin->d)->function(); \
if (gs != NULL) \
- lua_pushlstring(L, gs->getCString(), gs->getLength()); \
+- lua_pushlstring(L, gs->getCString(), gs->getLength()); \
++ lua_pushlstring(L, gs->c_str(), gs->getLength()); \
else \
-@@ -1132,7 +1132,7 @@
+ lua_pushnil(L); \
+ return 1; \
+@@ -911,7 +909,7 @@
+ if (i > 0 && i <= len) {
+ gs = new GooString();
+ if (((Array *) uin->d)->getString(i - 1, gs))
+- lua_pushlstring(L, gs->getCString(), gs->getLength());
++ lua_pushlstring(L, gs->c_str(), gs->getLength());
+ else
+ lua_pushnil(L);
+ delete gs;
+@@ -1063,7 +1061,7 @@
+ if (i > 0 && i <= len) {
+ gs = ((Catalog *) uin->d)->getJS(i - 1);
+ if (gs != NULL)
+- lua_pushlstring(L, gs->getCString(), gs->getLength());
++ lua_pushlstring(L, gs->c_str(), gs->getLength());
+ else
+ lua_pushnil(L);
+ delete gs;
+@@ -1132,7 +1130,7 @@
pdfdoc_changed_error(L);
s = copyString(luaL_checkstring(L, 2));
uobj = (udstruct *) luaL_checkudata(L, 3, M_Object);
@@ -153,7 +183,16 @@ diff -Naur a/texk/web2c/luatexdir/lua/lepdflib.cc
b/texk/web2c/luatexdir/lua/lep
return 0;
}

-@@ -1527,9 +1527,9 @@
+@@ -1378,7 +1376,7 @@
+ uin = (udstruct *) luaL_checkudata(L, 1, M_GooString);
+ if (uin->pd != NULL && uin->pd->pc != uin->pc)
+ pdfdoc_changed_error(L);
+- lua_pushlstring(L, ((GooString *) uin->d)->getCString(),
++ lua_pushlstring(L, ((GooString *) uin->d)->c_str(),
+ ((GooString *) uin->d)->getLength());
+ return 1;
+ }
+@@ -1527,9 +1525,9 @@
pdfdoc_changed_error(L);
luaL_checktype(L, 2, LUA_TBOOLEAN);
if (lua_toboolean(L, 2) != 0)
@@ -165,16 +204,18 @@ diff -Naur a/texk/web2c/luatexdir/lua/lepdflib.cc
b/texk/web2c/luatexdir/lua/lep
return 0;
}

-@@ -1813,7 +1813,7 @@
+@@ -1813,8 +1811,8 @@
if (uin->pd != NULL && uin->pd->pc != uin->pc)
pdfdoc_changed_error(L);
if (((Object *) uin->d)->isString()) {
- gs = ((Object *) uin->d)->getString();
+- lua_pushlstring(L, gs->getCString(), gs->getLength());
+ gs = (GooString *)((Object *) uin->d)->getString();
- lua_pushlstring(L, gs->getCString(), gs->getLength());
++ lua_pushlstring(L, gs->c_str(), gs->getLength());
} else
lua_pushnil(L);
-@@ -2051,7 +2051,7 @@
+ return 1;
+@@ -2051,7 +2049,7 @@
pdfdoc_changed_error(L);
if (!((Object *) uin->d)->isDict())
luaL_error(L, "Object is not a Dict");
@@ -183,7 +224,25 @@ diff -Naur a/texk/web2c/luatexdir/lua/lepdflib.cc
b/texk/web2c/luatexdir/lua/lep
return 0;
}

-@@ -3038,12 +3038,12 @@
+@@ -2472,7 +2470,7 @@
+ pdfdoc_changed_error(L);
+ gs = ((PdfDocument *) uin->d)->doc->getFileName();
+ if (gs != NULL)
+- lua_pushlstring(L, gs->getCString(), gs->getLength());
++ lua_pushlstring(L, gs->c_str(), gs->getLength());
+ else
+ lua_pushnil(L);
+ return 1;
+@@ -2561,7 +2559,7 @@
+ if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
+ gs = ((PdfDocument *) uin->d)->doc->readMetadata();
+ if (gs != NULL)
+- lua_pushlstring(L, gs->getCString(), gs->getLength());
++ lua_pushlstring(L, gs->c_str(), gs->getLength());
+ else
+ lua_pushnil(L);
+ } else
+@@ -3038,12 +3036,12 @@

static int m_Attribute_setHidden(lua_State * L)
{
@@ -198,7 +257,7 @@ diff -Naur a/texk/web2c/luatexdir/lua/lepdflib.cc
b/texk/web2c/luatexdir/lua/lep
((Attribute *) uin->d)->setHidden(i);
return 0;
}
-@@ -3180,7 +3180,7 @@
+@@ -3180,7 +3178,7 @@
// Ref is false if the C++ functione return false
static int m_StructElement_getPageRef(lua_State * L)
{
@@ -207,7 +266,7 @@ diff -Naur a/texk/web2c/luatexdir/lua/lepdflib.cc
b/texk/web2c/luatexdir/lua/lep
Ref *r;
udstruct *uin, *uout;
uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
-@@ -3226,13 +3226,13 @@
+@@ -3226,16 +3224,16 @@

static int m_StructElement_getText(lua_State * L)
{
@@ -222,8 +281,12 @@ diff -Naur a/texk/web2c/luatexdir/lua/lepdflib.cc
b/texk/web2c/luatexdir/lua/lep
+ i = (bool) lua_toboolean(L, 2);
gs = ((StructElement *) uin->d)->getText(i);
if (gs != NULL)
- lua_pushlstring(L, gs->getCString(), gs->getLength());
-@@ -3321,7 +3321,7 @@
+- lua_pushlstring(L, gs->getCString(), gs->getLength());
++ lua_pushlstring(L, gs->c_str(), gs->getLength());
+ else
+ lua_pushnil(L);
+ return 1;
+@@ -3321,7 +3319,7 @@
{
Attribute::Type t;
Attribute::Owner o;
@@ -232,7 +295,7 @@ diff -Naur a/texk/web2c/luatexdir/lua/lepdflib.cc
b/texk/web2c/luatexdir/lua/lep
udstruct *uin, *uout;
const Attribute *a;
uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
-@@ -3329,7 +3329,7 @@
+@@ -3329,7 +3327,7 @@
pdfdoc_changed_error(L);
t = (Attribute::Type) luaL_checkint(L,1);
o = (Attribute::Owner) luaL_checkint(L,2);
diff --git
a/latex/texlive/patches/texlive-20180414-source-upstream_fixes-2.patch
b/latex/texlive/patches/texlive-20180414-source-upstream_fixes-2.patch
index eb152f3..d426bd6 100644
--- a/latex/texlive/patches/texlive-20180414-source-upstream_fixes-2.patch
+++ b/latex/texlive/patches/texlive-20180414-source-upstream_fixes-2.patch
@@ -5195,7 +5195,7 @@ diff -ruN
r47457/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc r49040/texk/web
+ charset = fontdesc.dictLookup("CharSet");
+ if (!charset.isNull() &&
+ charset.isString() && is_subsetable(fontmap))
-+ epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
++ epdf_mark_glyphs(fd, (char *)charset.getString()->c_str());
+ else
+ embed_whole_font(fd);
+ addFontDesc(fontdescRef.getRef(), fd);
@@ -5334,7 +5334,7 @@ diff -ruN
r47457/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc r49040/texk/web
+ pdf_printf("%s", convertNumToPDF(obj->getNum()));
+ } else if (obj->isString()) {
+ s = (GooString *)obj->getString();
-+ p = (char *)s->getCString();
++ p = (char *)s->c_str();
+ l = s->getLength();
+ if (strlen(p) == (unsigned int) l) {
+ pdf_puts("(");
@@ -6016,7 +6016,7 @@ diff -ruN
r47457/texk/web2c/pdftexdir/pdftosrc-poppler0.71.0.cc r49040/texk/web2
+ fprintf(stderr, "No SourceName found\n");
+ exit(1);
+ }
-+ outname = (char *)srcName.getString()->getCString();
++ outname = (char *)srcName.getString()->c_str();
+ // We cannot free srcName, as objname shares its string.
+ // srcName.free();
+ } else if (objnum > 0) {
@@ -6025,7 +6025,7 @@ diff -ruN
r47457/texk/web2c/pdftexdir/pdftosrc-poppler0.71.0.cc r49040/texk/web2
+ fprintf(stderr, "Not a Stream object\n");
+ exit(1);
+ }
-+ sprintf(buf, "%s", fileName->getCString());
++ sprintf(buf, "%s", fileName->c_str());
+ if ((p = strrchr(buf, '.')) == 0)
+ p = strchr(buf, 0);
+ if (objgen == 0)
@@ -6035,7 +6035,7 @@ diff -ruN
r47457/texk/web2c/pdftexdir/pdftosrc-poppler0.71.0.cc r49040/texk/web2
+ outname = buf;
+ } else { // objnum < 0 means we are extracting the
XRef table
+ extract_xref_table = true;
-+ sprintf(buf, "%s", fileName->getCString());
++ sprintf(buf, "%s", fileName->c_str());
+ if ((p = strrchr(buf, '.')) == 0)
+ p = strchr(buf, 0);
+ sprintf(p, ".xref");



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (bdb216133de4adf355f102aef552f8b65275540f), Pavel Vinogradov, 12/05/2018

Archive powered by MHonArc 2.6.24.

Top of Page