On Thu, Dec 21, 2017 at 11:44:23PM +0100, Matthias Kilian wrote:
> tl;dr: scroll down, apply the patch, run a bulk build, send ok's
Ping. There will be no update of print/poppler without this. I'm
trying to update poppler since more than 9 months now, fixed a
couple ports in advance, and the last piece that's in the way is
texlive. Nobody will debug it until a poppler update is in the
tree, and upstream probably won't fix it before tl-2018, which would
probably hit our ports tree end of 2018 or early 2019.
Either texlive suffers from the outdated bundled poppler, or all
other ports suffer from the outdated poppler in our tree.
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
