texlive 20200406

5 files changed, 130 insertions, 2 deletions

diff --git a/latex/texlive/DEPENDS b/latex/texlive/DEPENDS
index 5e4efd83c6..25f7a2412b 100755
--- a/latex/texlive/DEPENDS
+++ b/latex/texlive/DEPENDS
@@ -17,6 +17,8 @@ with_system icu &&
 with_system pixman &&
 with_system potrace LIBPOTRACE &&
 with_system zziplib &&
+# FIXME missing teckit spell
+# with_system teckit &&
 
 depends texlive-texmf &&
 depends xz-utils &&
diff --git a/latex/texlive/DETAILS b/latex/texlive/DETAILS
index 2a75c26464..905ab228f2 100755
--- a/latex/texlive/DETAILS
+++ b/latex/texlive/DETAILS
@@ -1,6 +1,6 @@
            SPELL=texlive
-         VERSION=20190410
-     SOURCE_HASH=sha512:7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e:UPSTREAM_HASH
+         VERSION=20200406
+     SOURCE_HASH=sha512:65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
           SOURCE="${SPELL}-${VERSION}-source.tar.xz"
    SOURCE_URL[0]=ftp://tug.org/historic/systems/texlive/${VERSION:0:4}/${SOURCE}
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION:0:8}-source"
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index e026472368..35387e0fa4 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -2,6 +2,10 @@
 	* BUILD: Fixed build with binutils >= 2.35
 	* PRE_BUILD: Optimized data installation prefix patching
 	  Reworked poppler API patching
+	* DETAILS: updated spell to 20200406
+	* patches/freetype2-config.patch: Added fix for freetype2 detection
+	* patches/kpsewhich-default-progname.patch: Fixed kpsewhich default
+	  progname
 
 2019-08-13 Pavel Vinogradov <public@sourcemage.org>
 	* DEPENDS: needs ghostscript with libgs
diff --git a/latex/texlive/patches/freetype2-config.patch b/latex/texlive/patches/freetype2-config.patch
new file mode 100644
index 0000000000..4be76fb32a
--- /dev/null
+++ b/latex/texlive/patches/freetype2-config.patch
@@ -0,0 +1,106 @@
+Origin: Void Linux
+
+[ismael@sourcemage.org: Required for using freetype >= 2.9.1]
+
+Disables the use of freetype2-config. Does some weird stuff on
+i686, armv5tel, ppc*, etc. No harm caused by disabling it
+everywhere.
+
+--- a/texk/dvipng/configure	2020-06-08 10:00:42.953000000 +1000
++++ b/texk/dvipng/configure	2020-06-08 10:00:57.069000000 +1000
+@@ -16432,10 +16432,7 @@
+ else
+   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+ fi
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+   FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+   FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
+ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+--- a/configure	2020-06-08 10:03:04.785000000 +1000
++++ b/configure	2020-06-08 10:01:47.902000000 +1000
+@@ -21471,10 +21471,7 @@
+ else
+   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+ fi
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+   FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+   FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
+ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+--- a/libs/gd/configure	2019-03-26 04:27:50.000000000 +1100
++++ b/libs/gd/configure	2020-06-08 10:06:28.481000000 +1000
+@@ -5933,10 +5933,7 @@
+ else
+   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+ fi
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+   FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+   FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
+ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+--- a/texk/dvisvgm/configure	2020-03-22 09:04:56.000000000 +1100
++++ b/texk/dvisvgm/configure	2020-06-08 10:08:15.384000000 +1000
+@@ -21794,10 +21794,7 @@
+ else
+   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+ fi
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+   FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+   FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
+ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+--- a/texk/xdvik/configure	2020-03-02 06:07:53.000000000 +1100
++++ b/texk/xdvik/configure	2020-06-08 10:08:15.731000000 +1000
+@@ -19055,10 +19055,7 @@
+ else
+   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+ fi
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+   FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+   FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
+ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+--- a/texk/web2c/configure	2020-01-17 09:02:50.000000000 +1100
++++ b/texk/web2c/configure	2020-06-08 10:08:15.533000000 +1000
+@@ -25346,10 +25346,7 @@
+ else
+   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+ fi
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+   FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+   FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
+ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+--- a/texk/ttf2pk2/configure	2019-03-26 04:27:50.000000000 +1100
++++ b/texk/ttf2pk2/configure	2020-06-08 10:08:15.656000000 +1000
+@@ -15265,10 +15265,7 @@
+ else
+   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+ fi
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+   FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+   FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
+ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
diff --git a/latex/texlive/patches/kpsewhich-default-progname.patch b/latex/texlive/patches/kpsewhich-default-progname.patch
new file mode 100644
index 0000000000..ca5b69057c
--- /dev/null
+++ b/latex/texlive/patches/kpsewhich-default-progname.patch
@@ -0,0 +1,16 @@
+Origin: Void Linux
+
+The default progname really should be kpsewhich, and makes a test
+pass which otherwise fails.
+
+--- a/texk/kpathsea/kpsewhich.c
++++ b/texk/kpathsea/kpsewhich.c
+@@ -60,7 +60,7 @@
+ boolean must_exist = false;
+ 
+ /* The program name, for `.PROG' construct in texmf.cnf.  (-program) */
+-string progname = NULL;
++string progname = "kpsewhich";
+ 
+ /* Safe input and output names to check.  (-safe-in-name and -safe-out-name) */
+ string safe_in_name = NULL;