<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ecfb5948bf1cf384a2e03d963423728b83e21ab6">https://github.com/macports/macports-ports/commit/ecfb5948bf1cf384a2e03d963423728b83e21ab6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ecfb594 texlive-bin: rebuild with patch for poppler 0.69.0
</span>ecfb594 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ecfb5948bf1cf384a2e03d963423728b83e21ab6
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Sep 25 17:22:58 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> texlive-bin: rebuild with patch for poppler 0.69.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This builds for me but I'll leave it to the maintainer to test/verify.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/57162.
</span>---
tex/texlive-bin/Portfile | 5 +-
tex/texlive-bin/files/patch-poppler-0.69.diff | 140 ++++++++++++++++++++++++++
2 files changed, 143 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tex/texlive-bin/Portfile b/tex/texlive-bin/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 09eda8c..cfe049b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tex/texlive-bin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tex/texlive-bin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ PortGroup muniversal 1.0
</span>
name texlive-bin
version 2018.47642
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span>
categories tex
maintainers {dports @drkp}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +97,8 @@ patchfiles-append patch-libs_luajit_configure.diff \
</span>
# patches for compatibility with latest poppler
patchfiles-append patch-pdftosrc-const.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-r47470.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-r47470.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-poppler-0.69.diff
</span>
post-patch {
reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/texlive/linked_scripts/Makefile.in
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tex/texlive-bin/files/patch-poppler-0.69.diff b/tex/texlive-bin/files/patch-poppler-0.69.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b6e2452
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tex/texlive-bin/files/patch-poppler-0.69.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,140 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- texk/web2c/luatexdir/lua/lepdflib.cc.orig 2018-09-25 03:45:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ texk/web2c/luatexdir/lua/lepdflib.cc 2018-09-25 03:46:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1125,12 +1125,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int m_Dict_add(lua_State * L)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ udstruct *uin, *uobj;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uin = (udstruct *) luaL_checkudata(L, 1, M_Dict);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (uin->pd != NULL && uin->pd->pc != uin->pc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdfdoc_changed_error(L);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- s = copyString(luaL_checkstring(L, 2));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s = luaL_checkstring(L, 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uobj = (udstruct *) luaL_checkudata(L, 3, M_Object);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((Dict *) uin->d)->add(s, std::move(*((Object *) uobj->d)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2051,7 +2051,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdfdoc_changed_error(L);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!((Object *) uin->d)->isDict())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ luaL_error(L, "Object is not a Dict");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ((Object *) uin->d)->dictAdd(copyString(s), std::move(*((Object *) uobj->d)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((Object *) uin->d)->dictAdd(s, std::move(*((Object *) uobj->d)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- texk/web2c/luatexdir/image/pdftoepdf.w.orig 2018-09-25 04:13:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ texk/web2c/luatexdir/image/pdftoepdf.w 2018-09-25 04:23:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -393,7 +393,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf->cave = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static void copyName(PDF pdf, char *s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void copyName(PDF pdf, const char *s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf_out(pdf, '/');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (; *s != 0; s++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -475,7 +475,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copyString(pdf, (GooString *)obj->getString());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case objName:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- copyName(pdf, (char *)obj->getName());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ copyName(pdf, obj->getName());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case objNull:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf_add_null(pdf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc.orig 2018-09-25 04:43:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc 2018-09-25 04:49:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -310,7 +310,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void copyFontDict(Object * obj, InObj * r)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i, l;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *key;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *key;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!obj->isDict())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdftex_fail("PDF inclusion: invalid dict type <%s>",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ obj->getTypeName());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -382,7 +382,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static void copyFont(char *tag, Object * fontRef)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void copyFont(const char *tag, Object * fontRef)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stemV;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -822,7 +822,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Object groupDict;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool writeSepGroup = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Object info;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *key;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *key;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char s[256];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i, l;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int rotate;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -977,7 +977,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ l = dic1.getLength();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < l; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- groupDict.dictAdd(copyString(dic1.getKey(i)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ groupDict.dictAdd(dic1.getKey(i),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dic1.getValNF(i));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // end modification
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc.orig 2018-09-25 06:09:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc 2018-09-25 06:13:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -275,7 +275,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void copyObject(Object *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static void copyName(char *s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void copyName(const char *s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf_puts("/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (; *s != 0; s++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -290,7 +290,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void copyDictEntry(Object * obj, int i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Object obj1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- copyName((char *)obj->dictGetKey(i));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ copyName(obj->dictGetKey(i));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf_puts(" ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ obj1 = obj->dictGetValNF(i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copyObject(&obj1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -355,7 +355,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!procset.isName())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ procset.getTypeName());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- copyName((char *)procset.getName());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ copyName(procset.getName());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf_puts(" ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf_puts("]\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -456,7 +456,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fontRef.isRef())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copyFont(obj->dictGetKey(i), &fontRef);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (fontRef.isDict()) { // some programs generate pdf with embedded font object
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- copyName((char *)obj->dictGetKey(i));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ copyName(obj->dictGetKey(i));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf_puts(" ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copyObject(&fontRef);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -467,7 +467,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf_puts(">>\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static void copyOtherResources(Object * obj, char *key)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void copyOtherResources(Object * obj, const char *key)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // copies all other resources (write_epdf handles Fonts and ProcSets),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -589,7 +589,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf_puts(">");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (obj->isName()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- copyName((char *)obj->getName());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ copyName(obj->getName());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (obj->isNull()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf_puts("null");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (obj->isArray()) {
</span></pre><pre style='margin:0'>
</pre>