linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-03 06:27:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to texlive-2021.

Browse Source
This commit is contained in:
Ken Moffat 2021-04-24 02:38:42 +01:00
parent 356e8b5f63
commit 00a31549ff
6 changed files with 104 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
introduction/welcome/changelog.xml
View File

@ -41,6 +41,16 @@
</listitem> </listitem>
--> -->
<listitem>
<para>April 23rd, 2021</para>
<itemizedlist>
<listitem>
<para>[ken] - Update to texlive-2021. Fixes
<ulink url="&blfs-ticket-root;14846">#14846</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>April 21th, 2021</para> <para>April 21th, 2021</para>
<itemizedlist> <itemizedlist>

8
packages.ent
View File

@ -1090,13 +1090,13 @@ to avoid building libxml2 twice, which is slow with all deps -->
<!ENTITY paps-version "0.7.1"> <!ENTITY paps-version "0.7.1">
<!-- Chapter 51 --> <!-- Chapter 51 -->
<!ENTITY texlive-version "20200406"> <!ENTITY texlive-version "20210325">
<!ENTITY texmf-version "20200406"> <!ENTITY texmf-version "20210325">
<!ENTITY tex-tlpdb-version "20200406"> <!ENTITY tex-tlpdb-version "20210325">
<!-- the year is used when setting up PATHs in the tl-installer <!-- the year is used when setting up PATHs in the tl-installer
page, as well as to reference the directory in texlive, also page, as well as to reference the directory in texlive, also
in asymptote, biber and xindy --> in asymptote, biber and xindy -->
<!ENTITY texlive-year "2020"> <!ENTITY texlive-year "2021">
<!ENTITY asymptote-version "2.70"> <!ENTITY asymptote-version "2.70">
<!ENTITY biber-version "2.16"> <!ENTITY biber-version "2.16">
<!ENTITY biblatex-version "3.16"> <!ENTITY biblatex-version "3.16">

160
pst/typesetting/texlive.xml
View File

@ -5,21 +5,21 @@
<!ENTITY texlive-download-http " "> <!ENTITY texlive-download-http " ">
<!ENTITY texlive-download-ftp "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texlive-version;-source.tar.xz"> <!ENTITY texlive-download-ftp "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texlive-version;-source.tar.xz">
<!ENTITY texlive-md5sum "a5d992e3cb8554ce92c55adde03958ba"> <!ENTITY texlive-md5sum "19da95538956e26570ef7fb202af258f">
<!ENTITY texlive-size "53 MB"> <!ENTITY texlive-size "53 MB">
<!ENTITY texlive-buildsize "8.5 GB including the additional download and the tests, 6.4 GB installed"> <!ENTITY texlive-buildsize "8.1 GB including the additional download and the tests, 7.0 GB installed">
<!ENTITY texlive-time "5.8 SBU including the additional download and the tests, building with parallelism=4"> <!ENTITY texlive-time "4.2 SBU including the additional download and the tests, building with parallelism=4">
<!ENTITY texlive-texmf-download-http " "> <!ENTITY texlive-texmf-download-http " ">
<!ENTITY texlive-texmf-download-ftp "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texmf-version;-texmf.tar.xz"> <!ENTITY texlive-texmf-download-ftp "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texmf-version;-texmf.tar.xz">
<!ENTITY texlive-texmf-md5sum "bca40df2ff11269fbcb2d1b4ff0278b1"> <!ENTITY texlive-texmf-md5sum "2426a62e43f8b07397ef2dd8367e0465">
<!ENTITY texlive-texmf-size "3.0 GB"> <!ENTITY texlive-texmf-size "3.3 GB">
<!ENTITY texlive-tlpdb-download-http " "> <!ENTITY texlive-tlpdb-download-http " ">
<!ENTITY texlive-tlpdb-download-ftp "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&tex-tlpdb-version;-tlpdb-full.tar.gz"> <!ENTITY texlive-tlpdb-download-ftp "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&tex-tlpdb-version;-tlpdb-full.tar.gz">
<!ENTITY texlive-tlpdb-md5sum "d8cd997c1bba422b30c9bc225e508794"> <!ENTITY texlive-tlpdb-md5sum "af0240961ecd28be5fd30d0e99b341d5">
<!ENTITY texlive-tlpdb-size "2.9 MB"> <!ENTITY texlive-tlpdb-size "3.0 MB">
]> ]>
@ -168,12 +168,12 @@
</para> </para>
</listitem> </listitem>
<!-- <listitem> <listitem>
<para> <para>
Required patch: <ulink url= Required patch: <ulink url=
"&patch-root;/texlive-&texlive-version;-source-upstream_fixes-1.patch"/> "&patch-root;/texlive-&texlive-version;-upstream_fixes-1.patch"/>
</para> </para>
</listitem>--> </listitem>
</itemizedlist> </itemizedlist>
<bridgehead renderas="sect3">TeX Live from source Dependencies</bridgehead> <bridgehead renderas="sect3">TeX Live from source Dependencies</bridgehead>
@ -222,18 +222,7 @@
<caution> <caution>
<para> <para>
The instructions here for dealing with <application>poppler</application> If you wish to upgrade to current <application>texlive</application>
will only work with versions of poppler used in BLFS-9.1 and later, i.e.
poppler &gt;= 0.83.0. If you wish to upgrade an older system, there
are versions of <filename>pdftoepdf{,-poppler*}.cc</filename> and
<filename>pdftosrc{,-newpoppler,-poppler*}.cc</filename> in <filename
class="directory">texk/web2c/pdftexdir</filename>. You should establish
which version of <application>poppler</application> is installed and use
the appropriate versions of these files.
</para>
<para>
Similarly, if you wish to upgrade to current <application>texlive</application>
on an older system where extra packages (<application>asymptote</application>. on an older system where extra packages (<application>asymptote</application>.
<application>biber</application>, <application>dvisvgm</application> or <application>biber</application>, <application>dvisvgm</application> or
<application>xindy</application>) have been installed, you will need to <application>xindy</application>) have been installed, you will need to
@ -256,47 +245,6 @@
# End texlive &texlive-year; addition</literal> # End texlive &texlive-year; addition</literal>
EOF</userinput></screen> EOF</userinput></screen>
<para>
<application>TexLive</application> ships with a very old version of
<application>poppler</application>, and some updated files for newer versions.
To use the system version, first identify it and then copy the correct
versions of the updated files (please read the Caution above):
</para>
<!-- on a release, drop this back to current version but update the
Caution above and ideally keep this commented, every other (expletive
deleted) poppler update tends to break this. Fortunately, upstream
has deleted the poppler directory from their source in
https://tug.org/svn/texlive?view=revision&revision=55138
so from TL2021 this aggravation should be gone. -->
<screen><userinput>SYSPOP= &amp;&amp;
MYPOPPLER_MAJOR=$(pkg-config --modversion poppler | cut -d '.' -f1)
if [ "$MYPOPPLER_MAJOR" = "0" ]; then
# if major was >=20, minor could start with 0 and not fit in octal
# causing error from 'let' in bash.
let MYPOPPLER_MINOR=$(pkg-config --modversion poppler | cut -d '.' -f2)
else
# force a value > 85
let MYPOPPLER_MINOR=99
fi
if [ "$MYPOPPLER_MINOR" -lt 85 ]; then
# BLFS-9.1 uses 0.85.0, ignore earlier versions in this script.
# If updating texlive on an older system, review the available
# variants for pdftoepdf and pdftosrc to use system poppler.
SYSPOP=
else
SYSPOP="--with-system-poppler --with-system-xpdf"
if [ "$MYPOPPLER_MINOR" -lt 86 ]; then
mv -v texk/web2c/pdftexdir/pdftoepdf{-poppler0.83.0,}.cc
else # 0.86.0 or later, including 20.08.0.
mv -v texk/web2c/pdftexdir/pdftoepdf{-poppler0.86.0,}.cc
fi
# For pdftosrc BLFS-9.1 uses 0.83.0 and that is the latest variant.
mv -v texk/web2c/pdftexdir/pdftosrc{-poppler0.83.0,}.cc
fi &amp;&amp;
export SYSPOP &amp;&amp;
unset MYPOPPLER_{MAJOR,MINOR}</userinput></screen>
<note> <note>
<para> <para>
A successful install requires some texlive A successful install requires some texlive
@ -308,48 +256,44 @@ unset MYPOPPLER_{MAJOR,MINOR}</userinput></screen>
<para> <para>
Now, as a normal user: Now, as a normal user:
</para> </para>
<!-- after the export!
patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch &amp;&amp;--> <screen><userinput>export TEXARCH=$(uname -m |
<screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp; sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
patch -Np1 -i ../texlive-&texlive-version;-upstream_fixes-1.patch &amp;&amp;
mkdir texlive-build &amp;&amp; mkdir texlive-build &amp;&amp;
cd texlive-build &amp;&amp; cd texlive-build &amp;&amp;
../configure \ ../configure \
--prefix=/opt/texlive/&texlive-year; \ --prefix=/opt/texlive/&texlive-year; \
--bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH \ --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH \
--datarootdir=/opt/texlive/&texlive-year; \ --datarootdir=/opt/texlive/&texlive-year; \
--includedir=/opt/texlive/&texlive-year;/include \ --includedir=/opt/texlive/&texlive-year;/include \
--infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \ --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \
--libdir=/opt/texlive/&texlive-year;/lib \ --libdir=/opt/texlive/&texlive-year;/lib \
--mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man \ --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man \
--disable-native-texlive-build \ --disable-native-texlive-build \
--disable-static --enable-shared \ --disable-static --enable-shared \
--disable-dvisvgm \ --disable-dvisvgm \
--with-system-cairo \ --with-system-cairo \
--with-system-fontconfig \ --with-system-fontconfig \
--with-system-freetype2 \ --with-system-freetype2 \
--with-system-gmp \ --with-system-gmp \
--with-system-graphite2 \ --with-system-graphite2 \
--with-system-harfbuzz \ --with-system-harfbuzz \
--with-system-icu \ --with-system-icu \
--with-system-libgs \ --with-system-libgs \
--with-system-libpaper \ --with-system-libpaper \
--with-system-libpng \ --with-system-libpng \
--with-system-mpfr \ --with-system-mpfr \
--with-system-pixman \ --with-system-pixman \
${SYSPOP} \ --with-system-zlib \
--with-system-zlib \
--with-banner-add=" - BLFS" &amp;&amp; --with-banner-add=" - BLFS" &amp;&amp;
make &amp;&amp; make</userinput></screen>
unset SYSPOP</userinput></screen>
<para> <para>
To test the results, issue: <command>make -k check</command>. To test the results, issue: <command>make check</command>.
One of the Kpathsea tests will fail because BLFS uses system
libraries.
<!-- https://tug.org/pipermail/tex-k/2019-August/003036.html -->
</para> </para>
<para> <para>
@ -382,6 +326,19 @@ tar -xf ../../texlive-&tex-tlpdb-version;-tlpdb-full.tar.gz -C /opt/texlive/&tex
close userinput, screen, comment pushd, patch, popd --> close userinput, screen, comment pushd, patch, popd -->
<screen role="root"><userinput>tar -xf ../../texlive-&texmf-version;-texmf.tar.xz -C /opt/texlive/&texlive-year; --strip-components=1</userinput></screen> <screen role="root"><userinput>tar -xf ../../texlive-&texmf-version;-texmf.tar.xz -C /opt/texlive/&texlive-year; --strip-components=1</userinput></screen>
<para>
It has been established by debian that the <command>python</command>
scripts in <filename class="directory">latex-make</filename> will work
with <command>python3</command>, so update them to invoke that by running
the following command as the <systemitem class="username">root</systemitem>
user:
</para>
<screen role="root"><userinput>for F in /opt/texlive/&texlive-year;/texmf-dist/scripts/latex-make/*.py ; do
sed -i 's%/usr/bin/env python%/usr/bin/python3%' $F
done
</userinput></screen>
<para> <para>
Still as the <systemitem class="username">root</systemitem> user, Still as the <systemitem class="username">root</systemitem> user,
initialise the new system (the commands <command>fmtutil-sys initialise the new system (the commands <command>fmtutil-sys
@ -408,11 +365,12 @@ mtxrun --generate</userinput></screen>
<sect2 role="commands"> <sect2 role="commands">
<title>Command Explanations</title> <title>Command Explanations</title>
<!--<para> <para>
<!-- https://tug.org/pipermail/tlbuild/2021q2/004885.html -->
<command>patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch</command>: <command>patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch</command>:
various problems have come to light since the shipped source was frozen to A small update to mpost and LuaTeX caused the binaries to be rebuilt.
be committed to DVDs. This ptch applies the same fixes.
</para>--> </para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../xincludes/tex-prefix.xml"/> href="../../xincludes/tex-prefix.xml"/>

30
pst/typesetting/tl-installer.xml
View File

@ -7,11 +7,11 @@
<!ENTITY tl-installer-download-http "http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz"> <!ENTITY tl-installer-download-http "http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz">
<!ENTITY tl-installer-download-ftp " "> <!ENTITY tl-installer-download-ftp " ">
<!ENTITY tl-installer-md5sum "769eb3849f931ca3efcbeeca093b95c0"> <!ENTITY tl-installer-md5sum "868c661c8f3c6c1fd7665a3a609390df">
<!ENTITY tl-installer-date "20200406"> <!-- in the directory name --> <!ENTITY tl-installer-date "20210413"> <!-- in the directory name -->
<!ENTITY tl-installer-size "3.8 MB"> <!ENTITY tl-installer-size "6.0 MB">
<!ENTITY tl-installer-buildsize "6.6 GB if everything is included"> <!ENTITY tl-installer-buildsize "7.1 GB if everything is included">
<!ENTITY tl-installer-time "varies, depending on network speed and traffic"> <!ENTITY tl-installer-time "varies, depending on network speed and traffic">
]> ]>
@ -124,12 +124,13 @@
this is to support a PDF viewer of your choice, for example this is to support a PDF viewer of your choice, for example
<xref role="nodep" linkend="epdfview"/>). <xref role="nodep" linkend="epdfview"/>).
</para> </para>
<!-- seems to not be needed in 2021
<para role="recommended"> <para role="recommended">
the optional non-wide-character ncurses library (for "some binary-only the optional non-wide-character ncurses library (for "some binary-only
application") from the bottom of the <application>Ncurses</application> application") from the bottom of the <application>Ncurses</application>
page in LFS is needed page in LFS is needed
for xindy.run which is used by <application>xindy</application> for xindy.run which is used by <application>xindy</application>
</para> </para> -->
<para role="recommended"> <para role="recommended">
The binary version of <application>asy</application> needs The binary version of <application>asy</application> needs
<xref linkend="freeglut"/>. <xref linkend="freeglut"/>.
@ -205,11 +206,30 @@
and the number of packages selected. and the number of packages selected.
</para> </para>
<para>
It has been established by debian that the <command>python</command>
scripts in <filename class="directory">latex-make</filename> will work
with <command>python3</command>, so update them to invoke that by running
the following command as the <systemitem class="username">root</systemitem>
user:
</para>
<screen role="root"><userinput>for F in /opt/texlive/&texlive-year;/texmf-dist/scripts/latex-make/*.py ; do
test -f $F &amp;&amp; sed -i 's%/usr/bin/env python%/usr/bin/python3%' $F || true
done
</userinput></screen>
</sect2> </sect2>
<sect2 role="commands"> <sect2 role="commands">
<title>Command Explanations</title> <title>Command Explanations</title>
<para>
<command>test -f $F &amp;&amp; sed ...</command>: in a small install these
files might not be present, so test if they exist and if not return 'true'
to avoid any error if this command has been copied into one of your own install scripts.
</para>
<para> <para>
<option>./install-tl --location <option>./install-tl --location
http://mirror.aut.ac.nz/CTAN/systems/texlive/tlnet/</option>: use a http://mirror.aut.ac.nz/CTAN/systems/texlive/tlnet/</option>: use a

4
xincludes/texrecommendlibs.xml
View File

@ -15,7 +15,5 @@
<xref linkend="harfbuzz"/> (built with graphite2 enabled), <xref linkend="harfbuzz"/> (built with graphite2 enabled),
<xref linkend="icu"/>, <xref linkend="icu"/>,
<xref linkend="libpaper"/> (used by at least context and xelatex), <xref linkend="libpaper"/> (used by at least context and xelatex),
and <xref linkend="libpng"/>, also and <xref linkend="libpng"/>
<xref linkend="poppler"/> (only used if suitable file versions
are available in <filename class="directory">texk/web2c/pdftexdir</filename>)
</para> </para>

6
xincludes/texruntime.xml
View File

@ -4,7 +4,11 @@
<para role="recommended"> <para role="recommended">
<xref role="runtime" linkend="python2"/> is used by many scripts. <xref role="runtime" linkend="python2"/> is used by many scripts - most are
unmaintained. Many invoke <filename>/usr/bin/env python</filename>, a couple
invoke <filename>/usr/bin/python</filename>. It is not generally known if
these will work with a symlink to <command>python3</command> (as used in some
distros) and two from pythontex invoke <command>python2</command>.
<xref role="runtime" linkend="ruby"/> is used by some scripts, mostly within <xref role="runtime" linkend="ruby"/> is used by some scripts, mostly within
mtx_context which is part of <application>conTeXt</application>, but also mtx_context which is part of <application>conTeXt</application>, but also
for one or two others, such as match_parens, which are generally useful. for one or two others, such as match_parens, which are generally useful.