From 7b7adc4f6f26f863e4d72e8527164d050f2c7efe Mon Sep 17 00:00:00 2001 From: fosslinux Date: Thu, 21 Jan 2021 21:26:04 +1100 Subject: [PATCH 1/2] xbps-triggers: add updmap to texmf trigger. On some texlive installations, without a rebuild of the database, new/removed fonts will cease to work correctly, potentially breaking the entire installation in some cases. --- srcpkgs/xbps-triggers/files/texmf-dist | 7 +++++++ srcpkgs/xbps-triggers/template | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/srcpkgs/xbps-triggers/files/texmf-dist b/srcpkgs/xbps-triggers/files/texmf-dist index 711f63fa1017cc..94a81947b21a14 100755 --- a/srcpkgs/xbps-triggers/files/texmf-dist +++ b/srcpkgs/xbps-triggers/files/texmf-dist @@ -16,6 +16,7 @@ UPDATE="$5" texhash=usr/bin/texhash fmtutil=usr/bin/fmtutil-sys +updmap=usr/bin/updmap-sys optional_engines="luahbtex,luajithbtex,luajittex,luatex,xetex" case "$ACTION" in @@ -32,6 +33,12 @@ run) ${fmtutil} --no-error-if-no-engine="${optional_engines}" \ --quiet --all >/dev/null || true fi + if [ -x ${updmap} ]; then + echo "Syncing font map files..." + yes y | ${updmap} --quiet --syncwithtrees >/dev/null + echo "Updating font map files..." + ${updmap} --quiet >/dev/null + fi ;; *) exit 1 diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index 75010d6bee7d3b..b649b5f0bfa9ec 100644 --- a/srcpkgs/xbps-triggers/template +++ b/srcpkgs/xbps-triggers/template @@ -1,6 +1,6 @@ # Template file for 'xbps-triggers' pkgname=xbps-triggers -version=0.118 +version=0.119 revision=1 bootstrap=yes short_desc="XBPS triggers for Void Linux" From 629de1f474101fc9eb9e69d9fac3c0abe1a8515b Mon Sep 17 00:00:00 2001 From: fosslinux Date: Thu, 21 Jan 2021 21:27:06 +1100 Subject: [PATCH 2/2] texlive: fix updmap, remove conflict with psutils. - updmap fix is needed for the trigger. TEXMFROOT is not the correct path in our setup, patch it to what it really should be. - psutils was conflicting, but these tools are still useful. Rename then with a -tl prefix to indicate this (also move around a couple of files that were in the wrong place relating to psutils). --- srcpkgs/texlive/patches/updmap.patch | 13 +++++++++++++ srcpkgs/texlive/template | 24 ++++++++++++++---------- 2 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 srcpkgs/texlive/patches/updmap.patch diff --git a/srcpkgs/texlive/patches/updmap.patch b/srcpkgs/texlive/patches/updmap.patch new file mode 100644 index 00000000000000..5eb47be4d8c474 --- /dev/null +++ b/srcpkgs/texlive/patches/updmap.patch @@ -0,0 +1,13 @@ +kpsewhich TEXMFROOT is not the correct value to use in our setup. + +--- texk/texlive/linked_scripts/texlive/updmap.pl 2021-01-21 11:15:02.314074252 +1100 ++++ texk/texlive/linked_scripts/texlive/updmap.pl 2021-01-21 11:15:53.365456336 +1100 +@@ -19,7 +19,7 @@ + my $TEXMFROOT; + BEGIN { + $^W = 1; +- $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`; ++ $TEXMFROOT = "/usr/share/texmf-dist"; + if ($?) { + die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n"; + } diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template index 34f89b15972705..72481d85bcbfe5 100644 --- a/srcpkgs/texlive/template +++ b/srcpkgs/texlive/template @@ -1,7 +1,7 @@ # Template file for 'texlive' pkgname=texlive version=20200406 -revision=6 +revision=7 wrksrc="texlive-${version}-source" build_wrksrc="build" build_style=gnu-configure @@ -71,7 +71,7 @@ makedepends="cairo-devel freetype-devel gd-devel graphite-devel gmp-devel harfbuzz-devel icu-devel libpaper-devel libpng-devel mpfr-devel poppler-devel pixman-devel libteckit-devel zlib-devel zziplib-devel libXaw-devel" -depends="dialog ghostscript perl-Tk texlive-core xbps-triggers>=0.115_1" +depends="dialog ghostscript perl-Tk texlive-core xbps-triggers>=0.119_1" short_desc="TeX Live" maintainer="fosslinux " license="GPL-2.0-or-later" @@ -217,10 +217,12 @@ EOF } post_install() { - # Those pages are psutils' man-pages - for f in extractres includeres psbook psjoin psnup psresize psselect pstops - do - rm -f $DESTDIR/usr/share/man/man1/$f.1 + # These tools are still useful for a texlive workflow, but are modified + # psutils and conflict with psutils; rename them to have a tl- prefix + for f in extractres includeres psbook psjoin psnup psresize psselect \ + pstops epsffit ; do + mv "${DESTDIR}/usr/share/man/man1/"{,tl-}"${f}.1" + mv "${DESTDIR}/usr/bin/"{,tl-}"${f}" done cp -rf ${wrksrc}/texk/tests/TeXLive \ "${DESTDIR}/usr/share/texmf-dist/scripts/texlive" @@ -265,9 +267,10 @@ texlive-dvi_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - tools for dvi based workflow" pkg_install() { - for i in afm2tfm bbox epsffit extractres includeres ps2eps psbook psjoin \ - psnup psresize psselect pstops ; do + for i in afm2tfm bbox tl-extractres tl-includeres tl-psbook tl-psjoin \ + tl-psnup tl-psresize tl-psselect tl-pstops ; do vmove "usr/bin/${i}" + vmove "usr/share/man/man1/${i}.1" done vmove usr/bin/dvi* } @@ -373,13 +376,14 @@ texlive-ConTeXt_package() { short_desc+=" - alternative general-purpose document processor" pkg_install() { for i in context contextjit mptopdf mtxrun mtxrunjit texexec \ - texmfstart dosepsbin epspdf epspdftk purifyeps repstopdf ; do + texmfstart dosepsbin epspdf epspdftk purifyeps repstopdf \ + ps2eps tl-epsffit ; do vmove "usr/bin/${i}" done for i in context dosepsbin epspdf epstopdf ps2eps purifyeps ; do vmove "usr/share/texmf-dist/scripts/${i}" done - for i in epsffit ps2eps ; do + for i in tl-epsffit ps2eps ; do vmove "usr/share/man/man1/${i}.1" done }