wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-09 00:23:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

texlive: fix updmap, remove conflict with psutils.

Browse source 
- 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]
This commit is contained in:
fosslinux 2021-01-21 21:27:06 +11:00 • committed by Andrew J. Hesford
parent 8462fa73e4
commit af51134b0b
2 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
srcpkgs/texlive/patches/updmap.patch Normal file
View file

@ -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
srcpkgs/texlive/template
View file

@ -1,7 +1,7 @@
# Template file for 'texlive' # Template file for 'texlive'
pkgname=texlive pkgname=texlive
version=20200406 version=20200406
revision=6 revision=7
wrksrc="texlive-${version}-source" wrksrc="texlive-${version}-source"
build_wrksrc="build" build_wrksrc="build"
build_style=gnu-configure 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 harfbuzz-devel icu-devel libpaper-devel libpng-devel mpfr-devel
poppler-devel pixman-devel libteckit-devel zlib-devel zziplib-devel poppler-devel pixman-devel libteckit-devel zlib-devel zziplib-devel
libXaw-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" short_desc="TeX Live"
maintainer="fosslinux <fosslinux@aussies.space>" maintainer="fosslinux <fosslinux@aussies.space>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
@ -217,10 +217,12 @@ EOF
} }
post_install() { post_install() {
# Those pages are psutils' man-pages # These tools are still useful for a texlive workflow, but are modified
for f in extractres includeres psbook psjoin psnup psresize psselect pstops # psutils and conflict with psutils; rename them to have a tl- prefix
do for f in extractres includeres psbook psjoin psnup psresize psselect \
rm -f $DESTDIR/usr/share/man/man1/$f.1 pstops epsffit ; do
mv "${DESTDIR}/usr/share/man/man1/"{,tl-}"${f}.1"
mv "${DESTDIR}/usr/bin/"{,tl-}"${f}"
done done
cp -rf ${wrksrc}/texk/tests/TeXLive \ cp -rf ${wrksrc}/texk/tests/TeXLive \
"${DESTDIR}/usr/share/texmf-dist/scripts/texlive" "${DESTDIR}/usr/share/texmf-dist/scripts/texlive"
@ -265,9 +267,10 @@ texlive-dvi_package() {
depends="${sourcepkg}>=${version}_${revision}" depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - tools for dvi based workflow" short_desc+=" - tools for dvi based workflow"
pkg_install() { pkg_install() {
for i in afm2tfm bbox epsffit extractres includeres ps2eps psbook psjoin \ for i in afm2tfm bbox tl-extractres tl-includeres tl-psbook tl-psjoin \
psnup psresize psselect pstops ; do tl-psnup tl-psresize tl-psselect tl-pstops ; do
vmove "usr/bin/${i}" vmove "usr/bin/${i}"
vmove "usr/share/man/man1/${i}.1"
done done
vmove usr/bin/dvi* vmove usr/bin/dvi*
} }
@ -373,13 +376,14 @@ texlive-ConTeXt_package() {
short_desc+=" - alternative general-purpose document processor" short_desc+=" - alternative general-purpose document processor"
pkg_install() { pkg_install() {
for i in context contextjit mptopdf mtxrun mtxrunjit texexec \ 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}" vmove "usr/bin/${i}"
done done
for i in context dosepsbin epspdf epstopdf ps2eps purifyeps ; do for i in context dosepsbin epspdf epstopdf ps2eps purifyeps ; do
vmove "usr/share/texmf-dist/scripts/${i}" vmove "usr/share/texmf-dist/scripts/${i}"
done done
for i in epsffit ps2eps ; do for i in tl-epsffit ps2eps ; do
vmove "usr/share/man/man1/${i}.1" vmove "usr/share/man/man1/${i}.1"
done done
} }