[skip-ci] texlive-bin: update to 2018.47465

texlive-bin/PKGBUILD

@@ -1,9 +1,8 @@
 # Contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/texlive-bin
 
 pkgname=('texlive-bin' 'libsynctex')
-pkgver=2017.44590
-pkgrel=4
-_biber_ver=2.6 # for biblatex 3.5 only.
+pkgver=2018.47465
+pkgrel=1
 license=('GPL')
 arch=('x86_64')
 makedepends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
@@ -11,125 +10,128 @@ makedepends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
              'icu' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
              'perl' 'clisp' 'ffcall')
 url='http://tug.org/texlive/'
-source=("http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
-        "http://downloads.sourceforge.net/project/biblatex-biber/biblatex-biber/${_biber_ver}/binaries/Linux/biber-linux_x86_64.tar.gz"
-        "luatex-gcc7.patch"
-        "texlive-poppler-0.59.patch")
-noextract=(biber-linux_x86_64.tar.gz)
-md5sums=('aef593aa0021ececdaeb0845e85ec70b'
-         '25709fa4b66c57ec2dfe9e382f23d72c'
-         'd5d1671308eba33b4f23b697834485c6'
-         '382d5c6a3261d35055bd65974ebbd5f5')
+source=("https://sources.archlinux.org/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
+        "texlive-poppler-0.67.patch"
+        "freetype-pkgconfig.patch"
+        "synctex-missing-header.patch")
+sha256sums=('06d7a1c939cf7d6035850cefca1d01898ae51a879e20db684a202fd507a0cae5'
+            '1c444526e3967f82d68a003526b332e0401db7825e22b5542e6cd04f0e688310'
+            'bed44f4ccda369410e90eac527cf44b8c1afda7d987ae521b4fd5edb425eef3e'
+            'b6c81eb091b5910226e0359768edd178680debee56b63ab0a3753c3429c28ab0')
 
 prepare() {
-    tar xf biber-linux_x86_64.tar.gz
-    
     cd "$srcdir/source"
-    
+
+    # Synctex "make install" misses synctex_version.h
+    patch -Np1 -i "${srcdir}/synctex-missing-header.patch"
+
+    # Freetype2 2.9.1 package no longer has freetype-config
+    patch -Np1 -i "${srcdir}/freetype-pkgconfig.patch"
+    ./reautoconf
+
     # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
     sed -i s/SELFAUTOPARENT/TEXMFROOT/ texk/tex4htk/t4ht.c
 
     ## prevent compiling Xdvi with libXp
     sed -i~ 's|-lXp ||' texk/xdvik/configure
 
-    # Luatex crashes when compiled with GCC7.1
-    patch -Np0 -i "${srcdir}/luatex-gcc7.patch"
+    # Poppler 0.64 now returns const char* in getCString()
+    patch -Np1 -i "${srcdir}/texlive-poppler-0.67.patch"
 
     # Poppler 0.58 introduces API changes by hiding internal object
     # management.
-    patch -Np1 -i "${srcdir}/texlive-poppler-0.59.patch"
+    cp -pv texk/web2c/pdftexdir/pdftoepdf{-newpoppler.cc,.cc}
+    cp -pv texk/web2c/pdftexdir/pdftosrc{-newpoppler.cc,.cc}
 }
 
-
 build() {
    cd "$srcdir"
-   
+
    #############################################################
    ### configure
    cd source
    mkdir -p Work
    cd Work
    echo "--> Initial configuration..."
-  # we use temporary prefix to avoid messing the existing
-  # $pkgdir/usr/share/texmf tree
-  # system zlib is disabled due to issues with zlib 1.2.6 (FS#28221)
-  ../configure --prefix=/usr -C \
-    --sysconfdir=/etc \
-    --datarootdir=/usr/share \
-    --datadir=/usr/share \
-    --mandir=/usr/share/man \
-    --disable-native-texlive-build \
-    --with-banner-add="/Chakra" \
-    --disable-multiplatform \
-    --disable-dialog \
-    --disable-psutils \
-    --disable-t1utils \
-    --disable-bibtexu \
-    --disable-xz \
-    --enable-shared \
-    --disable-static \
-    --with-system-zlib \
-    --with-system-zziplib \
-    --with-system-pnglib \
-    --with-system-ncurses \
-    --with-system-t1lib \
-    --with-system-gd \
-    --with-system-poppler \
-    --with-system-xpdf \
-    --with-system-freetype2 \
-    --with-system-pixman \
-    --with-system-cairo \
-    --with-system-harfbuzz \
-    --with-system-graphite \
-    --with-system-icu \
-    --with-system-gmp \
-    --with-system-mpfr \
-    --with-system-potrace \
-    --with-system-libpaper \
-    --with-freetype2-libdir=/usr/lib \
-    --with-freetype2-include=/usr/include/freetype2 \
-    --with-xdvi-x-toolkit=xaw \
-    --disable-dump-share \
-    --disable-aleph \
-    --enable-luatex \
-    --with-clisp-runtime=default \
-    --enable-xindy --disable-xindy-rules --disable-xindy-docs
-  #############################################################
-  ### make
-  echo "-------------------------------------------------------"
-  echo "--> Building the whole beast ..."
-  echo "-------------------------------------------------------"
-  make
+   # we use temporary prefix to avoid messing the existing
+   # $pkgdir/usr/share/texmf tree
+   ../configure --prefix=/usr -C \
+     --sysconfdir=/etc \
+     --datarootdir=/usr/share \
+     --datadir=/usr/share \
+     --mandir=/usr/share/man \
+     --disable-native-texlive-build \
+     --with-banner-add="/Arch Linux" \
+     --disable-multiplatform \
+     --disable-dialog \
+     --disable-psutils \
+     --disable-t1utils \
+     --disable-bibtexu \
+     --disable-xz \
+     --enable-shared \
+     --disable-static \
+     --with-system-zlib \
+     --with-system-zziplib \
+     --with-system-pnglib \
+     --with-system-ncurses \
+     --with-system-t1lib \
+     --with-system-gd \
+     --with-system-poppler \
+     --with-system-xpdf \
+     --with-system-freetype2 \
+     --with-system-pixman \
+     --with-system-cairo \
+     --with-system-harfbuzz \
+     --with-system-graphite \
+     --with-system-icu \
+     --with-system-gmp \
+     --with-system-mpfr \
+     --with-system-potrace \
+     --with-system-libpaper \
+     --with-freetype2-libdir=/usr/lib \
+     --with-freetype2-include=/usr/include/freetype2 \
+     --with-xdvi-x-toolkit=xaw \
+     --disable-dump-share \
+     --disable-aleph \
+     --enable-luatex \
+     --with-clisp-runtime=default \
+     --enable-xindy --disable-xindy-rules --disable-xindy-docs
+   #############################################################
+   ### make
+   echo "-------------------------------------------------------"
+   echo "--> Building the whole beast ..."
+   echo "-------------------------------------------------------"
+   make
 }
 
 package_libsynctex() {
-  pkgdesc='Library for synchronization between TeX files and resulting file'
-  depends=('glibc' 'zlib')
-
-  install -d "$pkgdir"/usr/lib
+    pkgdesc='Library for synchronization between TeX files and resulting file'
+    depends=('glibc' 'zlib')
 
     cd "${srcdir}/source/Work"
-    make -C texk/web2c DESTDIR="${pkgdir}" install-data-am install-libLTLIBRARIES
+    make -C texk/web2c DESTDIR="${pkgdir}" \
+        install-data-am install-libLTLIBRARIES
 }
 
 package_texlive-bin() {
-  pkgdesc="TeX Live binaries"
+   pkgdesc="TeX Live binaries"
    depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
             'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
             'icu' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
             'libsynctex')
-  provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam')
-  conflicts=('pdfjam')
-  optdepends=('ed: for texconfig')
-  install="texlive.install"
-  options=('!strip')
+   provides=('lcdf-typetools' 'kpathsea' 'xindy')
+   optdepends=('ed: for texconfig'
+               'biber: for bibliography processing')
+   options=('!strip')
 
-  #############################################################
+   cd "$srcdir"
+
+   #############################################################
    ### install
    cd source
    # fixes for xindy
    find utils/xindy -name Makefile -exec sed -i -e "s|^prefix =.\+$|prefix = $pkgdir/usr|" -e "s|^mandir =.\+$|mandir = \${prefix}/share/man|" -e "s|^datadir =.\+$|datadir = \${datarootdir}/texmf|" -e "s|^docdir =.\+$|docdir = \${datadir}/doc/xindy|" '{}' \;
-  
+
    echo "-------------------------------------------------------"
    echo "--> Proceeding with make install ..."
    echo "-------------------------------------------------------"
@@ -171,10 +173,13 @@ package_texlive-bin() {
    # remove dangling symlinks
    _bibtexextra_scripts="
 bbl2bib
+bib2gls
 bibdoiadd
 bibexport
 bibmradd
+biburl2doi
 bibzbladd
+convertgls2bib
 listbib
 ltx2crossrefxml
 multibibliography
@@ -200,6 +205,7 @@ context
 contextjit
 ctanify
 ctanupload
+ctan-o-mat
 de-macro
 depythontex
 deweb
@@ -207,6 +213,7 @@ dosepsbin
 dtxgen
 dvi2fax
 dviasm
+dviinfox
 dvired
 e2pall
 epstopdf
@@ -225,6 +232,7 @@ httexi
 htxelatex
 htxetex
 installfont-tl
+jfmutil
 kpsepath
 kpsetool
 kpsewhere
@@ -233,6 +241,7 @@ latex-git-log
 latex-papersize
 latex2man
 latex2nemeth
+latexdef
 latexdiff
 latexdiff-vc
 latexfileversion
@@ -310,6 +319,8 @@ texosquery
 texosquery-jre5
 texosquery-jre8
 thumbpdf
+tlcockpit
+tlshell
 typeoutfileinfo
 updmap
 updmap-sys
@@ -334,6 +345,7 @@ kanji-config-updmap-user
    _latexextra_scripts="
 authorindex
 exceltex
+l3build
 makedtx
 makeglossaries
 makeglossaries-lite
@@ -343,6 +355,7 @@ ps4pdf
 splitindex
 svn-multi
 vpe
+wordcount
 yplan"
    _music_scripts="lily-glyph-commands lily-image-commands lily-rebuild-pdfs
 m-tx musixtex musixflx pmxchords"
@@ -378,9 +391,6 @@ pn2pdf"
    done
    ###################################################################
 
-   ## install biber
-   install -m755 "${srcdir}"/biber "${pkgdir}/usr/bin/biber"
-   
    # remove libsynctex
    rm -f "$pkgdir"/usr/include/synctex/*
    rm -f "$pkgdir"/usr/lib/libsynctex.*

texlive-bin/freetype-pkgconfig.patch

@@ -0,0 +1,22 @@
+--- source/m4/kpse-freetype2-flags.m4.orig	2015-06-16 01:27:13.292945838 +0200
++++ source/m4/kpse-freetype2-flags.m4	2018-05-26 23:51:50.567080501 +0200
+@@ -21,17 +21,9 @@
+ 
+ # KPSE_FREETYPE2_OPTIONS([WITH-SYSTEM])
+ # -------------------------------------
+-AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [freetype-config])])
++AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [pkg-config])])
+ 
+ # KPSE_FREETYPE2_SYSTEM_FLAGS
+ # ---------------------------
+ AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+-AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+-  AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
+-fi
+-]) # KPSE_FREETYPE2_SYSTEM_FLAGS
++_KPSE_PKG_CONFIG_FLAGS([freetype2], [freetype2], [])])

texlive-bin/synctex-missing-header.patch

@@ -0,0 +1,12 @@
+--- source.orig/texk/web2c/synctexdir/am/synctex.am	2016-05-08 19:08:26.231570952 +0200
++++ source/texk/web2c/synctexdir/am/synctex.am	2018-05-27 00:14:26.011125669 +0200
+@@ -55,7 +55,8 @@
+ if SYNCTEX
+ syncinclude_HEADERS = \
+ 	synctexdir/synctex_parser.h \
+-	synctexdir/synctex_parser_utils.h
++	synctexdir/synctex_parser_utils.h \
++	synctexdir/synctex_version.h
+ 
+ pkgconfig_DATA = synctexdir/synctex.pc
+ endif SYNCTEX

texlive-bin/texlive-poppler-0.67.patch

@@ -0,0 +1,99 @@
+diff -ur source/texk/web2c/luatexdir/image/pdftoepdf.w source.new/texk/web2c/luatexdir/image/pdftoepdf.w
+--- source/texk/web2c/luatexdir/image/pdftoepdf.w	2018-04-23 08:46:00.031575505 +0200
++++ source.new/texk/web2c/luatexdir/image/pdftoepdf.w	2018-04-23 08:42:06.762986242 +0200
+@@ -357,9 +357,9 @@
+     pdf->cave = true;
+ }
+ 
+-static void copyString(PDF pdf, GooString * string)
++static void copyString(PDF pdf, const GooString * string)
+ {
+-    char *p;
++    const char *p;
+     unsigned char c;
+     size_t i, l;
+     p = string->getCString();
+@@ -389,7 +389,7 @@
+     pdf->cave = true;
+ }
+ 
+-static void copyName(PDF pdf, char *s)
++static void copyName(PDF pdf, const char *s)
+ {
+     pdf_out(pdf, '/');
+     for (; *s != 0; s++) {
+diff -ur source/texk/web2c/luatexdir/lua/lepdflib.cc source.new/texk/web2c/luatexdir/lua/lepdflib.cc
+--- source/texk/web2c/luatexdir/lua/lepdflib.cc	2018-04-23 08:46:00.032575486 +0200
++++ source.new/texk/web2c/luatexdir/lua/lepdflib.cc	2018-04-23 08:42:06.762986242 +0200
+@@ -516,7 +516,7 @@
+ #define m_poppler_get_GOOSTRING(in, function)                  \
+ static int m_##in##_##function(lua_State * L)                  \
+ {                                                              \
+-    GooString *gs;                                             \
++    const GooString *gs;                                             \
+     udstruct *uin;                                             \
+     uin = (udstruct *) luaL_checkudata(L, 1, M_##in);          \
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)             \
+@@ -1650,7 +1650,7 @@
+ 
+ static int m_Object_getString(lua_State * L)
+ {
+-    GooString *gs;
++    const GooString *gs;
+     udstruct *uin;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+diff -ur source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc source.new/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
+--- source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc	2018-04-23 21:27:36.254598208 +0200
++++ source.new/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc	2018-04-23 21:17:36.475663912 +0200
+@@ -275,7 +275,7 @@
+ 
+ static void copyObject(Object *);
+ 
+-static void copyName(char *s)
++static void copyName(const char *s)
+ {
+     pdf_puts("/");
+     for (; *s != 0; s++) {
+@@ -418,7 +418,7 @@
+         && fontdescRef.isRef()
+         && fontdesc.isDict()
+         && embeddableFont(&fontdesc)
+-        && (fontmap = lookup_fontmap(basefont.getName())) != NULL) {
++        && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
+         // round /StemV value, since the PDF input is a float
+         // (see Font Descriptors in PDF reference), but we only store an
+         // integer, since we don't want to change the struct.
+@@ -427,7 +427,7 @@
+         charset = fontdesc.dictLookup("CharSet");
+         if (!charset.isNull() &&
+             charset.isString() && is_subsetable(fontmap))
+-            epdf_mark_glyphs(fd, charset.getString()->getCString());
++            epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
+         else
+             embed_whole_font(fd);
+         addFontDesc(fontdescRef.getRef(), fd);
+@@ -554,8 +554,8 @@
+     Object obj1;
+     int i, l, c;
+     Ref ref;
+-    char *p;
+-    GString *s;
++    const char *p;
++    const GString *s;
+     if (obj->isBool()) {
+         pdf_printf("%s", obj->getBool()? "true" : "false");
+     } else if (obj->isInt()) {
+diff -ur source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc source.new/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
+--- source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc	2018-04-23 21:27:36.254598208 +0200
++++ source.new/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc	2018-04-23 08:42:06.762986242 +0200
+@@ -68,7 +68,7 @@
+     Stream *s;
+     Object srcStream, srcName, catalogDict;
+     FILE *outfile;
+-    char *outname;
++    const char *outname;
+     int objnum = 0, objgen = 0;
+     bool extract_xref_table = false;
+     int c;
+