tl;dr: scroll down, apply the patch, run a bulk build, send ok's

Hi,

i tried hard to get texlive (especially that pdftex thing) work
with newer poppler versions, but without any progress. I've patches
that let print/gexlive/base build with newer poppler, but pdftex
fails and breaks at least math/R and math/octave (which indirectly
use pdftex for rendering their documentation). I don't have enough
spare time to debug pdftex, and, to be honest, I don't *want* debug
pdftex.

So, here's a proposal to build print/texlive/base with the (outdated)
poppler bundled in the distfile. Maybe it's outdated, but at the
moment the only port stopping me from updating poppler is
print/texlive/base.

I hope that this diff, making it possible to update print/poppler,
will make it easier to look what's wrong with pdftex, and I'll also
send a send a separate mail with the above mentioned patches for
building print/texlive/base with a newer poppler).

I also think that things got out of control upstream (which isn't
upstream but midstream, including dozens if not hundreds of programs
in this texlive "distribution"). IIRC, Years ago, Edd asked them
to *not* bundle xpdf but use poppler, yet they still bundle xpdf
but their autoconf macros written for detecting xpdf now detect
poppler include files.

texlive will suffer a little bit, because you should not pass
untrusted input to pdftex, but all other ports will benefit from
an overdue poppler update.

ok?

Ciao,
        Kili

Index: Makefile
===================================================================
RCS file: /cvs/ports/print/texlive/base/Makefile,v
retrieving revision 1.94
diff -u -p -r1.94 Makefile
--- Makefile    23 Oct 2017 17:11:02 -0000      1.94
+++ Makefile    21 Dec 2017 22:19:08 -0000
@@ -6,7 +6,7 @@ COMMENT =               base binaries for TeXLive typ
 DISTNAME =             texlive-${DIST_V}b-source
 PKGNAME =              texlive_base-${V}
 WRKDIST =              ${WRKDIR}/texlive-${DIST_V}-source
-REVISION =             4
+REVISION =             5
 
 DISTFILES =            ${DISTNAME}${EXTRACT_SUFX} \
                        texlive-${DIST_V}-extra${EXTRACT_SUFX}
@@ -19,7 +19,7 @@ SHARED_LIBS +=                texlua52        0.0 # 7.4
 WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext Xi Xmu Xpm Xrender Xt
 WANTLIB += c cairo expat fontconfig freetype gd glib-2.0 graphite2
 WANTLIB += harfbuzz harfbuzz-icu iconv icudata icui18n icuio icuuc intl
-WANTLIB += jpeg lcms2 m openjp2 paper pcre pixman-1 png poppler
+WANTLIB += jpeg m paper pcre pixman-1 png
 WANTLIB += potrace pthread ${COMPILER_LIBCXX} tiff webp xcb
 WANTLIB += xcb-render xcb-shm z zzip
 WANTLIB += ${LIBCXX}
@@ -35,7 +35,6 @@ RUN_DEPENDS =         print/ghostscript/gnu \
 LIB_DEPENDS =          converters/libiconv \
                        graphics/png \
                        graphics/gd \
-                       print/poppler \
                        graphics/cairo \
                        textproc/icu4c \
                        graphics/graphite2 \
@@ -46,15 +45,11 @@ LIB_DEPENDS =               converters/libiconv \
 
 MODULES =              textproc/intltool perl
 
-# c++-11 required for poppler
-COMPILER =             base-clang ports-gcc
-
 # Never set SEPARATE_BUILD
 CONFIGURE_STYLE =      gnu
 
 CPPFLAGS =     -I${X11BASE}/include \
-               -I${LOCALBASE}/include \
-               -I${LOCALBASE}/include/poppler
+               -I${LOCALBASE}/include
 
 CXXFLAGS +=    -std=c++11
 
@@ -112,12 +107,10 @@ CONFIGURE_ARGS += --mandir=${PREFIX}/man
                        --with-banner-add="-OpenBSD_Ports" \
                        --disable-luajittex \
                        --disable-mfluajit \
-                       --with-system-xpdf \
                        --with-system-icu \
                        --with-system-cairo \
                        --with-system-harfbuzz \
                        --with-system-graphite2 \
-                       --with-system-poppler \
                        --with-system-libpaper \
                        --with-system-zziplib \
                        --with-system-potrace

Reply via email to