From c09fcac6052fc6654d0eb1927d7692218f687c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= Date: Sat, 15 Nov 2025 20:04:49 +0100 Subject: [PATCH] texlive: some bug fix updates * In texlive_update.sh, run mktexlsr at the end to hopefully not rebuild the format database all the time. * Add some patches to the lua config files to fix the paths for ConTeXt (SELFAUTO* variables in mtxrun.lua similar to kpathsea and texmfcnf.lua). --- .../additional-files/texlive_update.sh | 6 ++--- .../patches/texlive-2025-source2.patchset | 24 +++++++++++++++++++ app-text/texlive/texlive-2025.recipe | 12 +++++++++- 3 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 app-text/texlive/patches/texlive-2025-source2.patchset diff --git a/app-text/texlive/additional-files/texlive_update.sh b/app-text/texlive/additional-files/texlive_update.sh index f8d60c726..e6e8f7614 100644 --- a/app-text/texlive/additional-files/texlive_update.sh +++ b/app-text/texlive/additional-files/texlive_update.sh @@ -1,8 +1,5 @@ #!/bin/bash -notify --group "TeXLive" --title "Installation in progress" --messageID texliveInstallID --timeout 10000 "Updating TeXLive filename database…" -mktexlsr - notify --group "TeXLive" --title "Installation in progress" --messageID texliveInstallID --timeout 10000 "Updating TeXLive format files…" fmtutil-sys --all @@ -15,4 +12,7 @@ fmtutil-sys --all notify --group "TeXLive" --title "Installation in progress" --messageID texliveInstallID --timeout 10000 "Updating TeXLive font maps…" updmap-sys +notify --group "TeXLive" --title "Installation in progress" --messageID texliveInstallID --timeout 10000 "Updating TeXLive filename database…" +mktexlsr + notify --group "TeXLive" --title "Installation finished" --messageID texliveInstallID "Took long enough…!" diff --git a/app-text/texlive/patches/texlive-2025-source2.patchset b/app-text/texlive/patches/texlive-2025-source2.patchset new file mode 100644 index 000000000..c4b2d4be8 --- /dev/null +++ b/app-text/texlive/patches/texlive-2025-source2.patchset @@ -0,0 +1,24 @@ +From ca10a54307db2c0830c787d2d1fbfe71dab84ffc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= +Date: Sat, 15 Nov 2025 16:04:40 +0100 +Subject: mtxrun.lua: hardcode SELFAUTO* variables similar to kpsewhich + + +diff --git a/texmf-dist/scripts/context/lua/mtxrun.lua b/texmf-dist/scripts/context/lua/mtxrun.lua +index 85a593c..31082cc 100644 +--- a/texmf-dist/scripts/context/lua/mtxrun.lua ++++ b/texmf-dist/scripts/context/lua/mtxrun.lua +@@ -21074,8 +21074,8 @@ do + local ownpath=environment.ownpath or dir.current() + if ownpath then + ossetenv('SELFAUTOLOC',file.collapsepath(ownpath)) +- ossetenv('SELFAUTODIR',file.collapsepath(ownpath.."/..")) +- ossetenv('SELFAUTOPARENT',file.collapsepath(ownpath.."/../..")) ++ ossetenv('SELFAUTODIR',file.collapsepath("/boot/system/data/texlive/texmf-dist")) ++ ossetenv('SELFAUTOPARENT',file.collapsepath("/boot/system/data/texlive")) + else + report_initialization("error: unable to locate ownpath") + os.exit() +-- +2.51.0 + diff --git a/app-text/texlive/texlive-2025.recipe b/app-text/texlive/texlive-2025.recipe index f158dd90e..993d93e39 100644 --- a/app-text/texlive/texlive-2025.recipe +++ b/app-text/texlive/texlive-2025.recipe @@ -6,7 +6,7 @@ are free software, including support for many languages around the world." HOMEPAGE="http://tug.org/texlive/" COPYRIGHT="1996 by collaboration between the TeX user groups." LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" fullVersion=20250308 SOURCE_URI="ftp://tug.org/historic/systems/texlive/$portVersion/install-tl-unx.tar.gz" SOURCE_URI_2="ftp://tug.org/historic/systems/texlive/$portVersion/texlive-$fullVersion-texmf.tar.xz" @@ -18,6 +18,7 @@ SOURCE_DIR="install-tl-$fullVersion" SOURCE_DIR_2="texlive-$fullVersion-texmf" SOURCE_DIR_3="texlive-$fullVersion-extra" SOURCE_FILENAME="install-tl-unx-$portVersion.tar.gz" +PATCHES_2="texlive-$portVersion-source2.patchset" ADDITIONAL_FILES=" createSubpackageInfos.pl getPackageEntries.pl @@ -198,6 +199,15 @@ GLOBAL_WRITABLE_FILES=" PATCH() { sed -i "s|\`kpsewhich -var-value=TEXMFROOT\`|\"$dataDir/texlive\"|" $sourceDir/tlpkg/TeXLive/TLUtils.pm + + # update texmfcnf.lua for ConTeXt: + TEXMFCNF=$sourceDir2/texmf-dist/web2c/texmfcnf.lua + sed -i -e "s@TEXMFLOCAL\s*=.*@TEXMFLOCAL = /boot/system/non-packaged/data/texmf-dist@" $TEXMFCNF + sed -i -e "s@TEXMFSYSVAR\s*=.*@TEXMFSYSVAR = $sharedStateDir/texlive@" $TEXMFCNF + sed -i -e "s@TEXMFSYSCONFIG\s*=.*@TEXMFSYSCONFIG = $sysconfDir/texlive@" $TEXMFCNF + sed -i -e "s@TEXMFHOME\s*=.*@TEXMFHOME = /boot/home/config/settings/texmf-dist@" $TEXMFCNF + sed -i -e "s@TEXMFVAR\s*=.*@TEXMFVAR = /boot/home/config/var/texmf@" $TEXMFCNF + sed -i -e "s@TEXMFCONFIG\s*=.*@TEXMFCONFIG = /boot/home/config/settings/texmf/config@" $TEXMFCNF } BUILD()