libre/texlive-bin: updated to 2018.48691

1 files changed, 21 insertions, 18 deletions

diff --git a/libre/texlive-bin/PKGBUILD b/libre/texlive-bin/PKGBUILD
index f10a19822..f6feac289 100644
--- a/libre/texlive-bin/PKGBUILD
+++ b/libre/texlive-bin/PKGBUILD
@@ -11,25 +11,25 @@
 #  - diable xindy on armv7h
 
 pkgname=('texlive-bin')
-pkgver=2018.47465
-pkgrel=5
+pkgver=2018.48691
+pkgrel=3
 pkgrel+=.par1
 license=('GPL')
 arch=('x86_64')
 arch+=('i686' 'armv7h')
-makedepends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
+makedepends=('git' 'cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
          'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
          'icu' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
          'perl' 'clisp' 'ffcall')
-makedepends+=('poppler=0.71.0' 'icu>=63' 'icu<64')
 url='http://tug.org/texlive/'
-source=("https://sources.archlinux.org/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
+_commit=f68b0992e13a2e155d71beb3e016ea4139023224  # texlive-2018.2
+source=("git+https://github.com/Tex-Live/texlive-source.git#commit=${_commit}"
         "poppler-compat-fixes-up-to-0.70.patch"
         "luatex-poppler-0.70-const-fixes.patch"
         "texlive-poppler-0.71.patch"
         "freetype-pkgconfig.patch"
         "synctex-missing-header.patch")
-sha256sums=('06d7a1c939cf7d6035850cefca1d01898ae51a879e20db684a202fd507a0cae5'
+sha256sums=('SKIP'
             '1a76b4be5544e431b60dace28169870a8b275e6d80323f9ef7f49b7da8df0b29'
             'f1d8b23f3072001fae5f2147aa4a50520d89fbc5b683c0da10b1417e52173c7a'
             'd8d2fde2f0978238a923b95d063adb7c84e8abde9ac808166bcfa0e3fc8a9c98'
@@ -37,25 +37,23 @@ sha256sums=('06d7a1c939cf7d6035850cefca1d01898ae51a879e20db684a202fd507a0cae5'
             'b6c81eb091b5910226e0359768edd178680debee56b63ab0a3753c3429c28ab0')
 
 prepare() {
-    cd "$srcdir/source"
+    cd "$srcdir/texlive-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
-
     # upstream compat fixes for latest poppler
     patch -Np1 -i "${srcdir}/poppler-compat-fixes-up-to-0.70.patch"
-    # fix build with poppler 0.71
-    find texk/web2c/{lua,pdf}texdir -type f | xargs sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' -i
+    # fix build with poppler 0.72
+    find texk/web2c/{lua,pdf}texdir -type f | xargs sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' -e 's|getCString|c_str|g' -i
     patch -p1 -i "${srcdir}/texlive-poppler-0.71.patch"
     cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.70.0,}.cc
     cp -pv texk/web2c/pdftexdir/pdftosrc{-newpoppler,}.cc
@@ -66,7 +64,7 @@ prepare() {
 }
 
 build() {
-   cd "$srcdir"
+   cd "$srcdir/texlive-source"
 
    if [ "${CARCH}" = "armv7h" ]; then
      local config_xindy="--disable-xindy"
@@ -76,7 +74,6 @@ build() {
 
    #############################################################
    ### configure
-   cd source
    mkdir -p Work
    cd Work
    echo "--> Initial configuration..."
@@ -122,7 +119,7 @@ build() {
      --disable-aleph \
      --enable-luatex \
      --with-clisp-runtime=default \
-     --disable-xindy-rules --disable-xindy-docs "$config_xindy"
+     $config_xindy --disable-xindy-rules --disable-xindy-docs
    #############################################################
    ### make
    echo "-------------------------------------------------------"
@@ -138,17 +135,23 @@ package_texlive-bin() {
             'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
             'icu' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
             'libsynctex')
-   depends+=('icu>=63' 'icu<64' 'poppler=0.71.0')
    provides=('lcdf-typetools' 'kpathsea' 'xindy')
    optdepends=('ed: for texconfig'
                'biber: for bibliography processing')
    options=('!strip')
 
-   cd "$srcdir"
+  local _icu_ver
+  _icu_ver=$(pacman -S --print-format='%v' icu)
+  depends+=("icu>=${_icu_ver}" "icu<$((${_icu_ver%%.*} + 1))")
+  local _poppler_ver
+  _poppler_ver=$(pacman -S --print-format='%v' poppler)
+  depends+=("poppler=${_poppler_ver}")
+
+
+   cd "$srcdir/texlive-source"
 
    #############################################################
    ### 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|" '{}' \;