diff options
| author | Pavel Vinogradov | 2018-09-19 20:04:47 -0400 |
|---|---|---|
| committer | Pavel Vinogradov | 2018-09-20 06:01:40 -0400 |
| commit | 9dd193902ad77152da4c63345875feef4aeb3ef6 (patch) | |
| tree | 16fe841e404ae40a1bc7b6d896d6ddd9972202a6 /latex | |
| parent | 56c27156b27b52658519f481343b8b4f7f6d5e6b (diff) | |
latex/texlive: adapted to poppler 0.68.0+
Diffstat (limited to 'latex')
| -rw-r--r-- | latex/texlive/HISTORY | 4 | ||||
| -rw-r--r-- | latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch | 30 |
2 files changed, 34 insertions, 0 deletions
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY index cf58c24880..9bdcfa822e 100644 --- a/latex/texlive/HISTORY +++ b/latex/texlive/HISTORY @@ -1,3 +1,7 @@ +2018-09-19 Pavel Vinogradov <public@sourcemage.org> + * patches/texlive-20180414-source-upstream_fixes-1.patch: + adapted to poppler 0.68.0 or higher + 2018-05-22 Pavel Vinogradov <public@sourcemage.org> * PRE_BUILD: more fixes to poppler related files 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 e151069225..77e7acfb41 100644 --- a/latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch +++ b/latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch @@ -149,6 +149,15 @@ diff -Naur a/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc b/texk/web2c/pdftexdir } else if (obj->isNull()) { pdf_puts("null"); } else if (obj->isArray()) { +@@ -977,7 +977,7 @@ + } + l = dic1.getLength(); + for (i = 0; i < l; i++) { +- groupDict.dictAdd(copyString(dic1.getKey(i)), ++ groupDict.dictAdd((const char *) copyString(dic1.getKey(i)), + dic1.getValNF(i)); + } + // end modification diff -Naur a/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc b/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc --- a/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc 2017-10-17 22:52:13.000000000 +0100 +++ b/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc 2018-04-30 16:29:41.360904749 +0100 @@ -280,3 +289,24 @@ diff -Naur a/texk/web2c/ptexdir/tests/free_pena.tex b/texk/web2c/ptexdir/tests/f + \ifnum\CNTB<\LIM +\repeat +\bye +diff -Naur a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc +--- a/texk/web2c/luatexdir/lua/lepdflib.cc ++++ b/texk/web2c/luatexdir/lua/lepdflib.cc +@@ -1132,7 +1132,7 @@ + pdfdoc_changed_error(L); + s = copyString(luaL_checkstring(L, 2)); + uobj = (udstruct *) luaL_checkudata(L, 3, M_Object); +- ((Dict *) uin->d)->add(s, std::move(*((Object *) uobj->d))); ++ ((Dict *) uin->d)->add((const char *) s, std::move(*((Object *) uobj->d))); + return 0; + } + +@@ -2051,7 +2051,7 @@ + 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((const char *) copyString(s), std::move(*((Object *) uobj->d))); + return 0; + } + |