From 7ad91ac43839d3bb6df2b20c901a14f75fc3b7c8 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Wed, 21 Apr 2021 10:34:27 -0400
Subject: [texlive-bin]: upgrade to v2021.58686

---
 libre/texlive-bin/PKGBUILD | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'libre/texlive-bin')

diff --git a/libre/texlive-bin/PKGBUILD b/libre/texlive-bin/PKGBUILD
index c6a2e1155..21dd988fd 100644
--- a/libre/texlive-bin/PKGBUILD
+++ b/libre/texlive-bin/PKGBUILD
@@ -15,19 +15,19 @@
 
 
 pkgname=('texlive-bin' 'libsynctex')
-pkgver=2020.54586
-pkgrel=12
+pkgver=2021.58686
+pkgrel=2
 pkgrel+=.parabola1
 license=('GPL')
 arch=('x86_64')
 arch+=('i686' 'armv7h')
-makedepends=('git' 'cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
+makedepends=('git' 'cairo' 'pixman' 'graphite' 't1lib' 'gd'
              'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
              'icu' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
              'perl' 'clisp' 'ffcall' 'libxcrypt')
 [[ "${CARCH}" == 'armv7h' ]] && makedepends=( $(sed -E 's/clisp|ffcall//g' <<<${makedepends[@]}) )
 url='https://tug.org/texlive/'
-_commit=8e5e0e89d413d09cca133c8966d1a3af8a2ac440 # svn://tug.org/texlive/trunk/Build/source@54586
+_commit=ccb6338507149edf2772bfccb9933b72761f4cc4 # svn://tug.org/texlive/trunk/Build/source@58686
 source=("git+https://github.com/Tex-Live/texlive-source.git#commit=${_commit}")
 sha256sums=('SKIP')
 
@@ -36,10 +36,6 @@ prepare() {
 
     # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
     sed -i s/SELFAUTOPARENT/TEXMFROOT/ texk/tex4htk/t4ht.c
-
-    # pdftex poppler compatibility
-    cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.86.0,}.cc
-    cp -pv texk/web2c/pdftexdir/pdftosrc{-poppler0.83.0,}.cc
 }
 
 build() {
@@ -73,8 +69,6 @@ build() {
      --with-system-ncurses \
      --with-system-t1lib \
      --with-system-gd \
-     --with-system-poppler \
-     --with-system-xpdf \
      --with-system-freetype2 \
      --with-system-pixman \
      --with-system-cairo \
@@ -124,8 +118,9 @@ package_texlive-bin() {
                'biber: for bibliography processing')
    options=('!strip')
 
-   # pin to current 'icu' and 'poppler' libs
-   local poppler_ver=$(pacman -S --print-format='%v' poppler)
+   # pin to strongly-coupled dependency versions
+   local poppler_ver=$(pacman -S --print-format='%v' poppler | tail -n 1)
+   depends=(${depends[*]/poppler/})
    depends+=('libicui18n.so' 'libicuuc.so' "poppler=${poppler_ver}")
 
    cd "$srcdir/texlive-source"
@@ -193,6 +188,7 @@ a2ping
 a5toa4
 adhocfilelist
 afm2afm
+albatross
 allcm
 allec
 allneeded
@@ -231,6 +227,7 @@ fmtutil-sys
 fmtutil-user
 fontinst
 fragmaster
+git-latexdiff
 ht
 htcontext
 htlatex
@@ -259,6 +256,7 @@ latexmk
 latexpand
 latexrevise
 listings-ext.sh
+llmk
 ltxfileinfo
 ltximg
 luaotfload-tool
@@ -299,6 +297,7 @@ repstopdf
 rpdfcrop
 rungs
 simpdftex
+spix
 srcredact
 sty2dtx
 tex4ebook
@@ -351,6 +350,7 @@ kanji-config-updmap-user
    _latexextra_scripts="
 authorindex
 exceltex
+hyperxmp-add-bytecount
 l3build
 makedtx
 makeglossaries
@@ -365,7 +365,10 @@ webquiz
 wordcount
 yplan"
    _music_scripts="lily-glyph-commands lily-image-commands lily-rebuild-pdfs
-m-tx musixtex musixflx pmxchords"
+m-tx
+musixtex
+musixflx
+pmxchords"
    _pictures_scripts="
 cachepic
 epspdf
@@ -374,7 +377,8 @@ fig4latex
 getmapdl
 mathspic
 mkpic
-pn2pdf"
+pn2pdf
+tikztosvg"
    _pstricks_scripts="pedigree pst2pdf"
    _science_scripts="pygmentex ulqda"
    for s in \
-- 
cgit v1.2.3