diff options
| author | Pavel Vinogradov | 2018-12-05 17:51:13 -0500 |
|---|---|---|
| committer | Pavel Vinogradov | 2018-12-05 17:51:13 -0500 |
| commit | 6af03700d70a93b7069e01e274f36c991ec849f0 (patch) | |
| tree | ac34056d6db58a6abd32ba4480f190e65a859a27 /latex | |
| parent | d759aa768517a934c81d9b4f7a27a2a8126f92da (diff) | |
latex/texlive: fixed building with poppler scm branch
Diffstat (limited to 'latex')
| -rw-r--r-- | latex/texlive/HISTORY | 4 | ||||
| -rw-r--r-- | latex/texlive/patches/texlive-20180414-source-upstream_fixes-2.patch | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY index 07924eb1d7..0110db1014 100644 --- a/latex/texlive/HISTORY +++ b/latex/texlive/HISTORY @@ -1,3 +1,7 @@ +2018-12-05 Pavel Vinogradov <public@sourcemage.org> + * patches/texlive-20180414-source-upstream_fixes-2.patch: fixed for + poppler scm branch + 2018-12-05 Thomas Orgis <sobukus@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-2.patch b/latex/texlive/patches/texlive-20180414-source-upstream_fixes-2.patch index eb152f3352..d426bd6790 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"); |