* [PR PATCH] Texlive update fix
@ 2021-01-21 10:30 fosslinux
2021-01-21 12:23 ` dkwo
2021-01-21 13:41 ` [PR PATCH] [Closed]: " ahesford
0 siblings, 2 replies; 3+ messages in thread
From: fosslinux @ 2021-01-21 10:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1265 bytes --]
There is a new pull request by fosslinux against master on the void-packages repository
https://github.com/fosslinux/void-packages texlive-update-fix
https://github.com/void-linux/void-packages/pull/28074
Texlive update fix
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
@ahesford @dkwo
Fixes #28051
Fixes #27938
A patch file from https://github.com/void-linux/void-packages/pull/28074.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-texlive-update-fix-28074.patch --]
[-- Type: text/x-diff, Size: 5802 bytes --]
From 7b7adc4f6f26f863e4d72e8527164d050f2c7efe Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 711f63fa101..94a81947b21 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 75010d6bee7..b649b5f0bfa 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 <fosslinux@aussies.space>
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 00000000000..5eb47be4d8c
--- /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 34f89b15972..72481d85bcb 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 <fosslinux@aussies.space>"
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
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Texlive update fix
2021-01-21 10:30 [PR PATCH] Texlive update fix fosslinux
@ 2021-01-21 12:23 ` dkwo
2021-01-21 13:41 ` [PR PATCH] [Closed]: " ahesford
1 sibling, 0 replies; 3+ messages in thread
From: dkwo @ 2021-01-21 12:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/28074#issuecomment-764607758
Comment:
Looks good to me, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Closed]: Texlive update fix
2021-01-21 10:30 [PR PATCH] Texlive update fix fosslinux
2021-01-21 12:23 ` dkwo
@ 2021-01-21 13:41 ` ahesford
1 sibling, 0 replies; 3+ messages in thread
From: ahesford @ 2021-01-21 13:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1099 bytes --]
There's a closed pull request on the void-packages repository
Texlive update fix
https://github.com/void-linux/void-packages/pull/28074
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
@ahesford @dkwo
Fixes #28051
Fixes #27938
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-21 13:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-21 10:30 [PR PATCH] Texlive update fix fosslinux
2021-01-21 12:23 ` dkwo
2021-01-21 13:41 ` [PR PATCH] [Closed]: " ahesford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).