From 396abe07886403559d9850b2d7f0a3989419055c Mon Sep 17 00:00:00 2001 From: Ken Moffat Date: Sun, 1 May 2022 02:24:41 +0100 Subject: [PATCH] Update to texlive-2022. For the binary, libwww-perl is now recommended, therefore move that from perl-dependencies to the top-level perl-modules. --- general/prog/perl-deps.xml | 7 ++-- general/prog/perl-modules.xml | 8 ++++ .../perl-libwww-perl.xml | 2 +- introduction/welcome/changelog.xml | 10 +++++ packages.ent | 10 ++--- pst/typesetting/texlive.xml | 42 ++++++++++++------- pst/typesetting/tl-installer.xml | 10 +++-- 7 files changed, 62 insertions(+), 27 deletions(-) rename general/prog/{perl-deps => perl-modules}/perl-libwww-perl.xml (98%) diff --git a/general/prog/perl-deps.xml b/general/prog/perl-deps.xml index 34e9ef8257..7c1bb5406b 100644 --- a/general/prog/perl-deps.xml +++ b/general/prog/perl-deps.xml @@ -264,11 +264,11 @@ - + @@ -677,8 +677,9 @@ + diff --git a/general/prog/perl-modules.xml b/general/prog/perl-modules.xml index 163517d686..5c57be2dad 100644 --- a/general/prog/perl-modules.xml +++ b/general/prog/perl-modules.xml @@ -210,6 +210,11 @@ + + + + + @@ -417,6 +422,9 @@ + + diff --git a/general/prog/perl-deps/perl-libwww-perl.xml b/general/prog/perl-modules/perl-libwww-perl.xml similarity index 98% rename from general/prog/perl-deps/perl-libwww-perl.xml rename to general/prog/perl-modules/perl-libwww-perl.xml index 3cfaf8a5e6..17c2bdd274 100644 --- a/general/prog/perl-deps/perl-libwww-perl.xml +++ b/general/prog/perl-modules/perl-libwww-perl.xml @@ -4,7 +4,7 @@ %general-entities; - + ]> diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index c49cc2af6b..33364b01f1 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -41,6 +41,16 @@ --> + + May 1, 2022 + + + [ken] - Update to texlive-2022. Fixes + #16240. + + + + April 30, 2022 diff --git a/packages.ent b/packages.ent index efe59e6c00..7f1dcb88d6 100644 --- a/packages.ent +++ b/packages.ent @@ -434,6 +434,7 @@ to avoid building libxml2 twice, which is slow with all deps --> + @@ -503,7 +504,6 @@ to avoid building libxml2 twice, which is slow with all deps --> - @@ -1124,13 +1124,13 @@ to avoid building libxml2 twice, which is slow with all deps --> - - - + + + - + diff --git a/pst/typesetting/texlive.xml b/pst/typesetting/texlive.xml index f0ffc12749..b576d93cd0 100644 --- a/pst/typesetting/texlive.xml +++ b/pst/typesetting/texlive.xml @@ -3,23 +3,25 @@ %general-entities; - + + - - + + - - + + - + + - - + + - + - - + + ]> @@ -40,6 +42,19 @@ Introduction to TeX Live from source + + + According to the master + site in France only supports ftp and rsync. Now that ftp is generally + deprecated, that page has links to mirrors, some of which support https, + e.g. in Utah and Chemntiz as well as in China. If you prefer to use a + different mirror from the example links here, you will need to navigate + to systems/historic/texlive/&texlive-year; or systems/texlive/&texlive-year; + as the case may be. + + + + Most of TeX Live can be built from source without a pre-existing installation, but xindy (for indexing) needs @@ -168,12 +183,12 @@ - + TeX Live from source Dependencies @@ -259,7 +274,6 @@ EOF export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') && -patch -Np1 -i ../texlive-&texlive-version;-upstream_fixes-1.patch && mkdir texlive-build && cd texlive-build && diff --git a/pst/typesetting/tl-installer.xml b/pst/typesetting/tl-installer.xml index 7cce409618..7a49772ba1 100644 --- a/pst/typesetting/tl-installer.xml +++ b/pst/typesetting/tl-installer.xml @@ -7,11 +7,11 @@ - - - + + + - + ]> @@ -101,6 +101,8 @@ (to validate both the initial downloads, and also any updates you might later make using tlmgr.) + (to use a single connection to the server, + which will reduce its load and speed things up.) Recommended (at runtime)