<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/590c88fc604cb5d2f70a4ef6aafa49da0067654e">https://github.com/macports/macports-ports/commit/590c88fc604cb5d2f70a4ef6aafa49da0067654e</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 590c88f texlive-bin: use provided poppler for compatibility reasons
</span>590c88f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 590c88fc604cb5d2f70a4ef6aafa49da0067654e
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Thu Dec 6 13:43:08 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> texlive-bin: use provided poppler for compatibility reasons
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This is not ideal, but poppler keeps breaking compatibility and there
</span><span style='display:block; white-space:pre;color:#404040;'> have been enough changes in luatex lately that backporting the fix is
</span><span style='display:block; white-space:pre;color:#404040;'> hard, so we'll do this as a temporary fix and revisit in the next release.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See discussion in PR #3098
</span>---
tex/texlive-bin/Portfile | 36 ++++++++++++++++++++----------------
1 file changed, 20 insertions(+), 16 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 cfe049b..a2705dd 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;'>@@ -5,13 +5,18 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup texlive 1.0
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: due to poppler compatibility issues, we are temporarily using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the texlive-provided version of poppler rather than the port; we'll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# revisit on the next release. See
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/macports/macports-ports/pull/3098
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # luajittex requires muniversal (and some patches to configure
# scripts) to build universal
PortGroup muniversal 1.0
name texlive-bin
version 2018.47642
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 8
</span>
categories tex
maintainers {dports @drkp}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,16 +44,16 @@ master_sites https://giraffe.cs.washington.edu/texlive/ \
</span> https://alpaca.cs.washington.edu/texlive/ \
https://www.ambulatoryclam.net/texlive/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname texlive-source-${version}-stripped
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname texlive-source-${version}
</span> worksrcdir ${distname}
set tlpkgdistname tlpkg-TeXLive-${version}
distfiles-append ${tlpkgdistname}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums texlive-source-2018.47642-stripped.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 5cacb77580def95071a797c73e620f3f59558fb6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3d96e6993d52c373c78291c70c8d668968bad2e9e0da2249da4f6138434f3118 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18994796 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums texlive-source-2018.47642.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6ebb4f06ea254ef4c49be4052659144d376315f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d1afa118c02ddf13112b9dd7b46b014d802b544128c50ea5dc88a85ace148725 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 46433032 \
</span> tlpkg-TeXLive-2018.47642.tar.xz \
rmd160 c14c04444af0ee2ed739c7c6776b6afac39cf766 \
sha256 54505501198b171af862ca17c2da4388242b1a1b6e724aabb048ce5125517c8f \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +65,6 @@ depends_lib port:fontconfig \
</span> port:ncurses \
port:zlib \
port:libzzip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:poppler \
</span> path:lib/pkgconfig/cairo.pc:cairo \
path:lib/pkgconfig/pixman-1.pc:libpixman \
port:graphite2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,10 +99,10 @@ patchfiles-append patch-texk_chktex_Makefile.in.diff \
</span> patchfiles-append patch-libs_luajit_configure.diff \
patch-texk_web2c_configure.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patches for compatibility with latest poppler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-pdftosrc-const.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-r47470.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-poppler-0.69.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # patches for compatibility with latest poppler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patchfiles-append patch-pdftosrc-const.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;background:#e0e0e0;'>@@ -122,9 +126,9 @@ post-patch {
</span> reinplace "s|@@PREFIX@@|${prefix}|" ${worksrcpath}/texk/kpathsea/paths.h
reinplace "s|@@TEXMFSYSCONFIG@@|${texlive_texmfsysconfig}|" ${worksrcpath}/texk/kpathsea/paths.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Required to support poppler >0.59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename -force ${worksrcpath}/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc ${worksrcpath}/texk/web2c/pdftexdir/pdftoepdf.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename -force ${worksrcpath}/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc ${worksrcpath}/texk/web2c/pdftexdir/pdftosrc.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # # Required to support poppler >0.59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # file rename -force ${worksrcpath}/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc ${worksrcpath}/texk/web2c/pdftexdir/pdftoepdf.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # file rename -force ${worksrcpath}/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc ${worksrcpath}/texk/web2c/pdftexdir/pdftosrc.cc
</span> }
# We use MacPorts-provided libraries instead of the ones included in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,9 +169,9 @@ configure.args --bindir=${texlive_bindir} \
</span> --with-system-mpfr \
--with-system-ncurses \
--with-system-pixman \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-system-poppler \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-system-poppler \
</span> --with-system-potrace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-system-xpdf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-system-xpdf \
</span> --with-system-zlib \
--with-system-zziplib \
--disable-biber \
</pre><pre style='margin:0'>
</pre>