Skip to content

Commit

Permalink
texlive: fix updmap, remove conflict with psutils.
Browse files Browse the repository at this point in the history
- 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).

Closes: #28074 [via git-merge-pr]
  • Loading branch information
fosslinux authored and ahesford committed Jan 21, 2021
1 parent 8462fa7 commit af51134
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 10 deletions.
13 changes: 13 additions & 0 deletions 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";
}
24 changes: 14 additions & 10 deletions 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
Expand Down Expand Up @@ -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 <fosslinux@aussies.space>"
license="GPL-2.0-or-later"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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*
}
Expand Down Expand Up @@ -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
}
Expand Down

0 comments on commit af51134

Please sign in to comment.