texlive-installer: update to 20220403

pythontex patch has been removed since termux's python now support
multiprocessing!
This commit is contained in:
Henrik Grimler 2022-04-12 21:25:46 +02:00
parent 5caaef4f8e
commit 2ed75e267f
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
15 changed files with 122 additions and 325 deletions

View File

@ -1,6 +1,6 @@
--- ./tlpkg/TeXLive/TLUtils.pm.orig 2020-05-24 18:18:53.449497897 +0200
+++ ./tlpkg/TeXLive/TLUtils.pm 2020-05-24 18:20:12.493497841 +0200
@@ -1678,7 +1678,7 @@
--- ./tlpkg/TeXLive/TLUtils.pm.orig 2022-05-01 21:50:15.993394677 +0200
+++ ./tlpkg/TeXLive/TLUtils.pm 2022-05-01 21:50:48.037394654 +0200
@@ -1802,7 +1802,7 @@
}
my $cmd = $keyval{'cmd'};
@ -9,7 +9,7 @@
chomp($texdir);
my $texdir_bsl = conv_to_w32_path($texdir);
$cmd =~ s!^("?)TEXDIR/!$1$texdir/!g;
@@ -1753,7 +1753,7 @@
@@ -1877,7 +1877,7 @@
if (win32() && defined($keyval{'filew32'})) {
$file = $keyval{'filew32'};
}
@ -18,7 +18,7 @@
chomp($texdir);
my @syscmd;
if ($file =~ m/\.pl$/i) {
@@ -1828,7 +1828,7 @@
@@ -1952,7 +1952,7 @@
&log("postaction $how shortcut for " . $tlpobj->name . "\n");
if ($how eq "install") {

View File

@ -2,20 +2,23 @@ TERMUX_PKG_HOMEPAGE=https://www.tug.org/texlive/
TERMUX_PKG_DESCRIPTION="Wrapper around texlive's install-tl script"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
TERMUX_PKG_VERSION=20210325
TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=ftp://ftp.tug.org/texlive/historic/${TERMUX_PKG_VERSION:0:4}/install-tl-unx.tar.gz
TERMUX_PKG_SHA256=74eac0855e1e40c8db4f28b24ef354bd7263c1f76031bdc02b52156b572b7a1d
TERMUX_PKG_VERSION=20220403
TERMUX_PKG_SRCURL=https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${TERMUX_PKG_VERSION:0:4}/install-tl-unx.tar.gz
TERMUX_PKG_SHA256=e67edec49df6b7c4a987a7d5a9b31bcf41258220f9ac841c7a836080cd334fb5
TERMUX_PKG_PLATFORM_INDEPENDENT=true
TERMUX_PKG_DEPENDS="perl, texlive-bin (>= 20200406-4), gnupg, curl, lz4, xz-utils"
TERMUX_PKG_REPLACES="texlive"
TERMUX_PKG_BREAKS="texlive"
TERMUX_PKG_RM_AFTER_INSTALL="opt/texlive/install-tl/texmf-dist"
TERMUX_PKG_RM_AFTER_INSTALL="
opt/texlive/install-tl/texmf-dist
opt/texlive/install-tl/tlpkg/installer/curl
opt/texlive/install-tl/tlpkg/installer/wget
opt/texlive/install-tl/tlpkg/installer/xz
"
termux_step_make_install() {
mkdir -p $TERMUX_PREFIX/opt/texlive
sed -e "s|@TERMUX_PREFIX@|${TERMUX_PREFIX}|g" \
-e "s|@INSTALLER_VERSION@|${TERMUX_PKG_VERSION}|g" \
"$TERMUX_PKG_BUILDER_DIR"/installer.sh \
> $TERMUX_PREFIX/bin/termux-install-tl
chmod 700 $TERMUX_PREFIX/bin/termux-install-tl

View File

@ -1,11 +0,0 @@
--- ../cjk-gs-integrate.pl.orig 2020-05-01 17:26:10.709915553 +0200
+++ ./texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl 2020-05-01 17:28:25.023071451 +0200
@@ -1937,7 +1937,7 @@
my $foundres = '';
if (win32()) {
# determine tlgs or native gs
- chomp(my $foo = `kpsewhich -var-value=SELFAUTOPARENT`);
+ chomp(my $foo = `kpsewhich -var-value=TEXMFROOT`);
if ( -d "$foo/tlpkg/tlgs" ) {
# should be texlive with tlgs
print_debug("Assuming tlgs win32 ...\n");

View File

@ -1,6 +1,6 @@
diff -u -r ../crossrefware.orig/bbl2bib.pl ./texmf-dist/scripts/crossrefware/bbl2bib.pl
--- ../crossrefware.orig/bbl2bib.pl 2020-05-01 17:25:50.416609028 +0200
+++ ./texmf-dist/scripts/crossrefware/bbl2bib.pl 2020-05-01 17:28:25.033071437 +0200
diff -u -r texmf-dist/scripts/crossrefware.orig/bbl2bib.pl texmf-dist/scripts/crossrefware/bbl2bib.pl
--- texmf-dist/scripts/crossrefware.orig/bbl2bib.pl 2022-05-01 22:05:42.101394014 +0200
+++ texmf-dist/scripts/crossrefware/bbl2bib.pl 2022-05-01 22:08:14.421393905 +0200
@@ -98,7 +98,7 @@
use strict;
BEGIN {
@ -10,9 +10,9 @@ diff -u -r ../crossrefware.orig/bbl2bib.pl ./texmf-dist/scripts/crossrefware/bbl
if (length($TLMaster)) {
unshift @INC, "$TLMaster/texmf-dist/scripts/bibtexperllibs";
}
diff -u -r ../crossrefware.orig/bibdoiadd.pl ./texmf-dist/scripts/crossrefware/bibdoiadd.pl
--- ../crossrefware.orig/bibdoiadd.pl 2020-05-01 17:25:50.416609028 +0200
+++ ./texmf-dist/scripts/crossrefware/bibdoiadd.pl 2020-05-01 17:28:25.043071424 +0200
diff -u -r texmf-dist/scripts/crossrefware.orig/bibdoiadd.pl texmf-dist/scripts/crossrefware/bibdoiadd.pl
--- texmf-dist/scripts/crossrefware.orig/bibdoiadd.pl 2022-05-01 22:05:42.101394014 +0200
+++ texmf-dist/scripts/crossrefware/bibdoiadd.pl 2022-05-01 22:08:14.421393905 +0200
@@ -97,7 +97,7 @@
use strict;
BEGIN {
@ -22,9 +22,9 @@ diff -u -r ../crossrefware.orig/bibdoiadd.pl ./texmf-dist/scripts/crossrefware/b
if (length($TLMaster)) {
unshift @INC, "$TLMaster/texmf-dist/scripts/bibtexperllibs";
}
diff -u -r ../crossrefware.orig/bibmradd.pl ./texmf-dist/scripts/crossrefware/bibmradd.pl
--- ../crossrefware.orig/bibmradd.pl 2020-05-01 17:25:50.416609028 +0200
+++ ./texmf-dist/scripts/crossrefware/bibmradd.pl 2020-05-01 17:28:25.036404766 +0200
diff -u -r texmf-dist/scripts/crossrefware.orig/bibmradd.pl texmf-dist/scripts/crossrefware/bibmradd.pl
--- texmf-dist/scripts/crossrefware.orig/bibmradd.pl 2022-05-01 22:05:42.105394014 +0200
+++ texmf-dist/scripts/crossrefware/bibmradd.pl 2022-05-01 22:08:14.421393905 +0200
@@ -64,7 +64,7 @@
use strict;
BEGIN {
@ -34,9 +34,9 @@ diff -u -r ../crossrefware.orig/bibmradd.pl ./texmf-dist/scripts/crossrefware/bi
if (length($TLMaster)) {
unshift @INC, "$TLMaster/texmf-dist/scripts/bibtexperllibs";
}
diff -u -r ../crossrefware.orig/biburl2doi.pl ./texmf-dist/scripts/crossrefware/biburl2doi.pl
--- ../crossrefware.orig/biburl2doi.pl 2020-05-01 17:25:50.416609028 +0200
+++ ./texmf-dist/scripts/crossrefware/biburl2doi.pl 2020-05-01 17:28:25.039738095 +0200
diff -u -r texmf-dist/scripts/crossrefware.orig/biburl2doi.pl texmf-dist/scripts/crossrefware/biburl2doi.pl
--- texmf-dist/scripts/crossrefware.orig/biburl2doi.pl 2022-05-01 22:05:42.105394014 +0200
+++ texmf-dist/scripts/crossrefware/biburl2doi.pl 2022-05-01 22:08:14.425393905 +0200
@@ -51,7 +51,7 @@
use strict;
BEGIN {
@ -46,9 +46,9 @@ diff -u -r ../crossrefware.orig/biburl2doi.pl ./texmf-dist/scripts/crossrefware/
if (length($TLMaster)) {
unshift @INC, "$TLMaster/texmf-dist/scripts/bibtexperllibs";
}
diff -u -r ../crossrefware.orig/bibzbladd.pl ./texmf-dist/scripts/crossrefware/bibzbladd.pl
--- ../crossrefware.orig/bibzbladd.pl 2020-05-01 17:25:50.416609028 +0200
+++ ./texmf-dist/scripts/crossrefware/bibzbladd.pl 2020-05-01 17:28:25.043071424 +0200
diff -u -r texmf-dist/scripts/crossrefware.orig/bibzbladd.pl texmf-dist/scripts/crossrefware/bibzbladd.pl
--- texmf-dist/scripts/crossrefware.orig/bibzbladd.pl 2022-05-01 22:05:42.109394014 +0200
+++ texmf-dist/scripts/crossrefware/bibzbladd.pl 2022-05-01 22:08:14.425393905 +0200
@@ -64,7 +64,7 @@
use strict;
BEGIN {
@ -58,10 +58,10 @@ diff -u -r ../crossrefware.orig/bibzbladd.pl ./texmf-dist/scripts/crossrefware/b
if (length($TLMaster)) {
unshift @INC, "$TLMaster/texmf-dist/scripts/bibtexperllibs";
}
diff -u -r ../crossrefware.orig/ltx2crossrefxml.pl ./texmf-dist/scripts/crossrefware/ltx2crossrefxml.pl
--- ../crossrefware.orig/ltx2crossrefxml.pl 2020-05-01 17:25:50.416609028 +0200
+++ ./texmf-dist/scripts/crossrefware/ltx2crossrefxml.pl 2020-05-01 17:28:25.036404766 +0200
@@ -70,7 +70,7 @@
diff -u -r texmf-dist/scripts/crossrefware.orig/ltx2crossrefxml.pl texmf-dist/scripts/crossrefware/ltx2crossrefxml.pl
--- texmf-dist/scripts/crossrefware.orig/ltx2crossrefxml.pl 2022-05-01 22:05:42.109394014 +0200
+++ texmf-dist/scripts/crossrefware/ltx2crossrefxml.pl 2022-05-01 22:08:14.425393905 +0200
@@ -265,7 +265,7 @@
BEGIN {
# find files relative to our installed location within TeX Live

View File

@ -1,6 +1,6 @@
--- ../install-tl.orig 2020-04-30 07:08:00.824228666 +0200
+++ ./install-tl 2020-04-30 07:09:41.060703296 +0200
@@ -33,7 +33,7 @@
--- ./install-tl.orig 2022-03-16 23:20:47.000000000 +0100
+++ ./install-tl 2022-05-01 20:32:08.704613894 +0200
@@ -35,7 +35,7 @@
# debugging communication with external gui: use shared logfile
@ -9,7 +9,7 @@
$dblfile = $ENV{'TEMP'} . "\\dblog.txt" if ($^O =~ /^MSWin/i);
$dblfile = $ENV{'TMPDIR'} . "/dblog" if ($^O eq 'darwin'
&& exists $ENV{'TMPDIR'});
@@ -861,8 +861,6 @@
@@ -862,8 +862,6 @@
if ($opt_custom_bin) {
if (-d $opt_custom_bin && (-r "$opt_custom_bin/kpsewhich"
|| -r "$opt_custom_bin/kpsewhich.exe")) {
@ -18,7 +18,7 @@
} else {
tldie("$0: -custom-bin argument must be a directory "
. "with TeX Live binaries, not like: $opt_custom_bin\n");
@@ -980,11 +978,6 @@
@@ -997,11 +995,6 @@
do_install_packages();
if ($opt_custom_bin) {
$vars{'this_platform'} = "custom";
@ -30,7 +30,7 @@
}
}
# now we save every scheme that is fully covered by the stuff we have
@@ -1612,7 +1605,7 @@
@@ -1637,7 +1630,7 @@
set_var_from_alternatives( \$tex_prefix,
($opt_in_place ? abs_path($::installerdir) : undef),
$tlprefixenv,

View File

@ -6,8 +6,8 @@ export TMPDIR=@TERMUX_PREFIX@/tmp
echo ""
echo "You will now be shown texlive's install-tl text gui."
echo "You can customize settings, but you have to use the"
echo "default TEXDIR and custom binaries for texlive to be"
echo "able to find and run the binaries."
echo "default TEXDIR and custom binaries or else texlive"
echo "is unable to find and run the binaries."
echo ""
echo "Press 'c' to continue"
@ -58,8 +58,12 @@ fmtutil-sys --quiet --byfmt pdflatex
echo "[*] Running updmap"
updmap-sys --quiet
echo "[*] Setting up symlinks"
texlinks
if command texlinks; then
echo "[*] Setting up symlinks"
texlinks
else
echo "[!] texlive-scripts-extra is not installed, skipping to run texlinks"
fi
echo "[*] All done. Restart the shell or source"
echo " $PREFIX/etc/profile.d/texlive.sh"

View File

@ -1,5 +1,5 @@
--- ../pdfjam.orig 2020-04-04 09:23:16.198017919 +0200
+++ ./texmf-dist/scripts/pdfjam/pdfjam 2020-04-04 09:24:36.684519772 +0200
--- ./texmf-dist/scripts/pdfjam/pdfjam.orig 2022-05-01 22:13:53.209393663 +0200
+++ ./texmf-dist/scripts/pdfjam/pdfjam 2022-05-01 22:14:19.829393644 +0200
@@ -21,7 +21,7 @@
## The path searched for site-wide configuration files can be set ##
## by editing the following variable: ##

View File

@ -1,11 +0,0 @@
--- ../pedigree.pl.orig 2020-05-01 17:26:30.863222262 +0200
+++ ./texmf-dist/scripts/pedigree-perl/pedigree.pl 2020-05-01 17:28:24.936404899 +0200
@@ -110,7 +110,7 @@
BEGIN {
# find files relative to our installed location within TeX Live
- chomp(my $TLMaster = `kpsewhich -var-value=SELFAUTOPARENT`); # TL root
+ chomp(my $TLMaster = `kpsewhich -var-value=TEXMFROOT`); # TL root
if (length($TLMaster)) {
unshift @INC, "$TLMaster/texmf-dist/scripts/pedigree-perl";
$TLCONF = "$TLMaster/texmf-config/pedigree/pedigree.cfg";

View File

@ -1,231 +0,0 @@
--- ./texmf-dist/scripts/pythontex/pythontex3.py.orig 2021-06-29 21:49:58.517383332 +0200
+++ ./texmf-dist/scripts/pythontex/pythontex3.py 2021-06-29 21:58:43.769382956 +0200
@@ -57,13 +57,19 @@
from collections import defaultdict, OrderedDict, namedtuple
from re import match, sub, search
import subprocess
-import multiprocessing
from pygments.styles import get_all_styles
from pythontex_engines import *
import textwrap
import platform
import itertools
+try:
+ import multiprocessing.synchronize # noqa: F401
+ from multiprocessing import Pool
+except ImportError:
+ multiprocessing = False
+
+
if sys.version_info[0] == 2:
try:
import cPickle as pickle
@@ -192,8 +198,9 @@
temp_data['hashdependencies'] = False
if args.jobs is None:
try:
- jobs = multiprocessing.cpu_count()
+ jobs = os.cpu_count()
except NotImplementedError:
+ # Is this exception needed with os.cpu_count?
jobs = 1
temp_data['jobs'] = jobs
else:
@@ -1145,6 +1152,13 @@
+def eval_task(fun_name, arg_list):
+ '''
+ Some platforms, like android, does not support multiprocessing. For such
+ platforms we fall back to this function when running tasks.
+ '''
+ arg_tuple = tuple(arg_list)
+ return eval(fun_name)(*arg_tuple)
def do_multiprocessing(data, temp_data, old_data, engine_dict):
jobname = data['jobname']
@@ -1269,7 +1283,14 @@
# concurrent processes to a user-specified value for jobs. If the user
# has not specified a value, then it will be None, and
# multiprocessing.Pool() will use cpu_count().
- pool = multiprocessing.Pool(jobs)
+ if multiprocessing:
+ pool = Pool(jobs)
+ # Add task to list of tasks to run asynchronously, from function
+ # name and list of args.
+ # globals()[fun] converts string with function name into function handle
+ async_or_eval = lambda fun, args: pool.apply_async(globals()[fun], args)
+ else:
+ async_or_eval = eval_task
tasks = []
# If verbose, print a list of processes
@@ -1284,39 +1305,39 @@
family = key.split('#')[0]
# Uncomment the following for debugging, and comment out what follows
'''run_code(encoding, outputdir,
- workingdir,
- cc_dict_begin[family],
- code_dict[key],
- cc_dict_end[family],
- engine_dict[family].language,
- engine_dict[family].commands,
- engine_dict[family].created,
- engine_dict[family].extension,
- makestderr, stderrfilename,
- code_index_dict[key],
- engine_dict[family].errors,
- engine_dict[family].warnings,
- engine_dict[family].linenumbers,
- engine_dict[family].lookbehind,
- keeptemps, hashdependencies,
- pygments_settings]))'''
- tasks.append(pool.apply_async(run_code, [encoding, outputdir,
- workingdir,
- cc_dict_begin[family],
- code_dict[key],
- cc_dict_end[family],
- engine_dict[family].language,
- engine_dict[family].commands,
- engine_dict[family].created,
- engine_dict[family].extension,
- makestderr, stderrfilename,
- code_index_dict[key],
- engine_dict[family].errors,
- engine_dict[family].warnings,
- engine_dict[family].linenumbers,
- engine_dict[family].lookbehind,
- keeptemps, hashdependencies,
- pygments_settings]))
+ workingdir,
+ cc_dict_begin[family],
+ code_dict[key],
+ cc_dict_end[family],
+ engine_dict[family].language,
+ engine_dict[family].commands,
+ engine_dict[family].created,
+ engine_dict[family].extension,
+ makestderr, stderrfilename,
+ code_index_dict[key],
+ engine_dict[family].errors,
+ engine_dict[family].warnings,
+ engine_dict[family].linenumbers,
+ engine_dict[family].lookbehind,
+ keeptemps, hashdependencies,
+ pygments_settings)'''
+ tasks.append(async_or_eval('run_code', [encoding, outputdir,
+ workingdir,
+ cc_dict_begin[family],
+ code_dict[key],
+ cc_dict_end[family],
+ engine_dict[family].language,
+ engine_dict[family].commands,
+ engine_dict[family].created,
+ engine_dict[family].extension,
+ makestderr, stderrfilename,
+ code_index_dict[key],
+ engine_dict[family].errors,
+ engine_dict[family].warnings,
+ engine_dict[family].linenumbers,
+ engine_dict[family].lookbehind,
+ keeptemps, hashdependencies,
+ pygments_settings]))
if verbose:
print(' - Code process ' + key.replace('#', ':'))
@@ -1324,35 +1345,23 @@
for key in cons_dict:
family = key.split('#')[0]
if engine_dict[family].language.startswith('python'):
- if family in pygments_settings:
- # Uncomment the following for debugging
- '''python_console(jobname, encoding, outputdir, workingdir,
- fvextfile, pygments_settings[family],
- cc_dict_begin[family], cons_dict[key],
- cc_dict_end[family], engine_dict[family].startup,
- engine_dict[family].banner,
- engine_dict[family].filename)'''
- tasks.append(pool.apply_async(python_console, [jobname, encoding,
- outputdir, workingdir,
- fvextfile,
- pygments_settings[family],
- cc_dict_begin[family],
- cons_dict[key],
- cc_dict_end[family],
- engine_dict[family].startup,
- engine_dict[family].banner,
- engine_dict[family].filename]))
- else:
- tasks.append(pool.apply_async(python_console, [jobname, encoding,
- outputdir, workingdir,
- fvextfile,
- None,
- cc_dict_begin[family],
- cons_dict[key],
- cc_dict_end[family],
- engine_dict[family].startup,
- engine_dict[family].banner,
- engine_dict[family].filename]))
+ # Uncomment the following for debugging
+ '''python_console(jobname, encoding, outputdir, workingdir,
+ fvextfile, pygments_settings[family],
+ cc_dict_begin[family], cons_dict[key],
+ cc_dict_end[family], engine_dict[family].startup,
+ engine_dict[family].banner,
+ engine_dict[family].filename)'''
+ tasks.append(async_or_eval('python_console', [jobname, encoding,
+ outputdir, workingdir,
+ fvextfile,
+ pygments_settings[family] if family in pygments_settings else None,
+ cc_dict_begin[family],
+ cons_dict[key],
+ cc_dict_end[family],
+ engine_dict[family].startup,
+ engine_dict[family].banner,
+ engine_dict[family].filename]))
else:
print('* PythonTeX error')
print(' Currently, non-Python consoles are not supported')
@@ -1365,18 +1374,19 @@
# Uncomment the following for debugging
# do_pygments(encoding, outputdir, fvextfile, pygments_list,
# pygments_settings, typeset_cache, hashdependencies)
- tasks.append(pool.apply_async(do_pygments, [encoding, outputdir,
- fvextfile,
- pygments_list,
- pygments_settings,
- typeset_cache,
- hashdependencies]))
+ tasks.append(async_or_eval('do_pygments', [encoding, outputdir,
+ fvextfile,
+ pygments_list,
+ pygments_settings,
+ typeset_cache,
+ hashdependencies]))
if verbose:
print(' - Pygments process')
# Execute the processes
- pool.close()
- pool.join()
+ if multiprocessing:
+ pool.close()
+ pool.join()
# Get the outputs of processes
# Get the files and macros created. Get the number of errors and warnings
@@ -1387,7 +1397,11 @@
new_files = False
messages = []
for task in tasks:
- result = task.get()
+ if multiprocessing:
+ result = task.get()
+ else:
+ result = task
+
if result['process'] == 'code':
key = result['key']
files[key].extend(result['files'])

View File

@ -1,13 +1,41 @@
--- ../texconfig.sh.orig 2020-04-04 09:33:30.373390496 +0200
+++ ./texmf-dist/scripts/texlive-extra/texconfig.sh 2020-04-04 09:34:14.749963681 +0200
--- ./texmf-dist/scripts/texlive-extra/texconfig.sh.orig 2022-05-01 22:16:51.385393535 +0200
+++ ./texmf-dist/scripts/texlive-extra/texconfig.sh 2022-05-01 22:19:42.661393413 +0200
@@ -6,14 +6,14 @@
# invoke the right shell:
-test -f /bin/ksh && test -z "$RUNNING_KSH" \
+test -f @TERMUX_PREFIX@/bin/ksh && test -z "$RUNNING_KSH" \
&& { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
- && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
+ && { RUNNING_KSH=true; export RUNNING_KSH; exec @TERMUX_PREFIX@/bin/ksh $0 ${1+"$@"}; }
unset RUNNING_KSH
-test -f /bin/bsh && test -z "$RUNNING_BSH" \
+test -f @TERMUX_PREFIX@/bin/bsh && test -z "$RUNNING_BSH" \
&& { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
- && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
+ && { RUNNING_BSH=true; export RUNNING_BSH; exec @TERMUX_PREFIX@/bin/bsh $0 ${1+"$@"}; }
unset RUNNING_BSH
# hack around a bug in zsh:
@@ -40,7 +40,7 @@
TEXMFDBS TEXMFINI TEXMFSCRIPTS TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS
TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS
"
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tctmp.$$
+tmpdir=${TMPDIR-${TEMP-${TMP-@TERMUX_PREFIX@/tmp}}}/tctmp.$$
needsCleanup=false
lastUpdatedFile=
@@ -53,8 +53,8 @@
case $FMT in
"")
FMT=fmt
- test ! -x /bin/fmt && test ! -f /usr/bin/fmt &&
- { test -x /bin/adjust || test -x /usr/bin/adjust; } && FMT=adjust
+ test ! -x /bin/fmt && test ! -f @TERMUX_PREFIX@/bin/fmt &&
+ { test -x /bin/adjust || test -x @TERMUX_PREFIX@/bin/adjust; } && FMT=adjust
+ test ! -x @TERMUX_PREFIX@/bin/fmt && test ! -f @TERMUX_PREFIX@/bin/fmt &&
+ { test -x @TERMUX_PREFIX@/bin/adjust || test -x @TERMUX_PREFIX@/bin/adjust; } && FMT=adjust
;;
*)
return

View File

@ -1,6 +1,6 @@
--- ../texdef.pl.orig 2020-04-04 09:27:54.747454581 +0200
+++ ./texmf-dist/scripts/texdef/texdef.pl 2020-04-04 09:28:20.700734760 +0200
@@ -283,7 +283,7 @@
--- ./texmf-dist/scripts/texdef/texdef.pl.orig 2020-09-28 23:01:50.000000000 +0200
+++ ./texmf-dist/scripts/texdef/texdef.pl 2022-05-01 22:22:11.349393307 +0200
@@ -284,14 +284,14 @@
$EDITOR = 'texworks "%f"';
}
else {
@ -9,3 +9,11 @@
if (-x $ed) {
$EDITOR = $ed;
last;
}
}
if (!$EDITOR) {
- for my $ed (qw(/usr/bin/editor /usr/bin/open /bin/open)) {
+ for my $ed (qw(@TERMUX_PREFIX@/bin/editor @TERMUX_PREFIX@/bin/open @TERMUX_PREFIX@/bin/open)) {
if (-x $ed) {
$EDITOR = "$ed \"%f\"";
last;

View File

@ -1,5 +1,5 @@
--- ./texmf-dist/web2c/texmf.cnf.orig 2020-03-01 23:41:34.000000000 +0100
+++ ./texmf-dist/web2c/texmf.cnf 2020-04-30 09:19:57.748456275 +0200
--- ./texmf-dist/web2c/texmf.cnf.orig 2022-05-01 22:23:48.057393237 +0200
+++ ./texmf-dist/web2c/texmf.cnf 2022-05-01 22:24:03.305393226 +0200
@@ -59,7 +59,7 @@
% SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and
% SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive).
@ -9,7 +9,7 @@
% The main tree of distributed packages and programs:
TEXMFDIST = $TEXMFROOT/texmf-dist
@@ -382,7 +382,7 @@
@@ -387,7 +387,7 @@
% OSFONTDIR is to provide a convenient hook for allowing TeX to find
% fonts installed on the system (outside of TeX). An empty default
% value would add "//" to the search paths, so we give it a dummy value.
@ -18,7 +18,7 @@
% PostScript Type 1 outline fonts.
T1FONTS = $TEXMFDOTDIR;$TEXMF/fonts/type1//;$OSFONTDIR//
@@ -431,7 +431,7 @@
@@ -436,7 +436,7 @@
PDFTEXCONFIG = $TEXMFDOTDIR;$TEXMF/pdftex/{$progname,}//
% Used by DMP (ditroff-to-mpx), called by makempx -troff.
@ -27,7 +27,7 @@
MPSUPPORT = $TEXMFDOTDIR;$TEXMF/metapost/support
% For xdvi to find mime.types and .mailcap, if they do not exist in
@@ -582,7 +582,8 @@
@@ -590,7 +590,8 @@
$SELFAUTOPARENT/share/texmf/web2c,\
$SELFAUTOPARENT/texmf-local/web2c,\
$SELFAUTOPARENT/texmf-dist/web2c,\

View File

@ -1,6 +1,6 @@
--- ./texmf-dist/scripts/texlive/tlmgr.pl.orig 2020-04-30 17:37:55.089385823 +0200
+++ ./texmf-dist/scripts/texlive/tlmgr.pl 2020-04-30 17:38:21.193385804 +0200
@@ -74,7 +74,7 @@
--- ./texmf-dist/scripts/texlive/tlmgr.pl.orig 2022-05-01 22:25:19.677393172 +0200
+++ ./texmf-dist/scripts/texlive/tlmgr.pl 2022-05-01 22:25:52.269393149 +0200
@@ -65,7 +65,7 @@
}
if (-r "$bindir/$kpsewhichname") {
# if not in bootstrapping mode => kpsewhich exists, so use it to get $Master

View File

@ -1,11 +1,29 @@
--- ../TLUtils.pm.orig 2020-04-30 14:21:49.833109611 +0200
+++ ./tlpkg/TeXLive/TLUtils.pm 2020-04-30 14:21:22.356486506 +0200
@@ -1753,7 +1753,7 @@
--- ./tlpkg/TeXLive/TLUtils.pm.orig 2022-05-01 20:24:48.919325797 +0200
+++ ./tlpkg/TeXLive/TLUtils.pm 2022-05-01 20:30:27.652807200 +0200
@@ -1871,7 +1871,7 @@
}
my $cmd = $keyval{'cmd'};
- my $texdir = `kpsewhich -var-value=TEXMFROOT`;
+ my $texdir = "@TERMUX_PREFIX@/share/texlive";
chomp($texdir);
my $texdir_bsl = conv_to_w32_path($texdir);
$cmd =~ s!^("?)TEXDIR/!$1$texdir/!g;
@@ -1946,7 +1946,7 @@
if (win32() && defined($keyval{'filew32'})) {
$file = $keyval{'filew32'};
}
- my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`;
- my $texdir = `kpsewhich -var-value=TEXMFROOT`;
+ my $texdir = "@TERMUX_PREFIX@/share/texlive";
chomp($texdir);
my @syscmd;
if ($file =~ m/\.pl$/i) {
@@ -2021,7 +2021,7 @@
&log("postaction $how shortcut for " . $tlpobj->name . "\n");
if ($how eq "install") {
- my $texdir = `kpsewhich -var-value=TEXMFROOT`;
+ my $texdir = "@TERMUX_PREFIX@/share/texlive";
chomp($texdir);
my $texdir_bsl = conv_to_w32_path($texdir);
$icon =~ s!^TEXDIR/!$texdir/!;

View File

@ -1,11 +0,0 @@
--- ../tlshell.tcl.orig 2020-05-01 17:29:18.643000616 +0200
+++ ./texmf-dist/scripts/tlshell/tlshell.tcl 2020-05-01 17:29:38.669640826 +0200
@@ -1546,7 +1546,7 @@
tk_messageBox -message [__ "No backup directory defined"]
return
}
- set bdir [file join [exec kpsewhich -var-value SELFAUTOPARENT] $bdir]
+ set bdir [file join [exec kpsewhich -var-value TEXMFROOT] $bdir]
if {! [file isdirectory $bdir]} {
tk_messageBox -message [__ "Backup directory %s does not exist" $bdir]
return