Author: xry111
Date: Thu Aug 13 06:14:57 2020
New Revision: 23508
Log:
texlive: fix the instruction to use system poppler-20.08
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/pst/typesetting/texlive.xml
trunk/BOOK/xincludes/texrecommendlibs.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Thu Aug 13 05:42:00 2020 (r23507)
+++ trunk/BOOK/general.ent Thu Aug 13 06:14:57 2020 (r23508)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "12"> <!-- Always 2 digits -->
+<!ENTITY day "13"> <!-- Always 2 digits -->
<!ENTITY month "08"> <!-- Always 2 digits -->
<!ENTITY year "2020">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "August 12th, &year;">
+<!ENTITY releasedate "August 13th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Thu Aug 13 05:42:00
2020 (r23507)
+++ trunk/BOOK/introduction/welcome/changelog.xml Thu Aug 13 06:14:57
2020 (r23508)
@@ -42,6 +42,16 @@
</listitem>
-->
<listitem>
+ <para>August 13th, 2020</para>
+ <itemizedlist>
+ <listitem>
+ <para>[xry111] - Revert r23505, and fix the instruction to build
+ texlive with poppler-20.08.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>August 12th, 2020</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/pst/typesetting/texlive.xml
==============================================================================
--- trunk/BOOK/pst/typesetting/texlive.xml Thu Aug 13 05:42:00 2020
(r23507)
+++ trunk/BOOK/pst/typesetting/texlive.xml Thu Aug 13 06:14:57 2020
(r23508)
@@ -222,7 +222,7 @@
</para>
<caution>
- <!--<para>
+ <para>
The instructions here for dealing with
<application>poppler</application>
will only work with versions of poppler used in BLFS-9.1 and later,
i.e.
poppler >= 0.83.0. If you wish to upgrade an older system, there
@@ -231,10 +231,10 @@
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>
<para>
- If you wish to upgrade to current <application>texlive</application>
+ Similarly, if you wish to upgrade to current
<application>texlive</application>
on an older system where extra packages
(<application>asymptote</application>.
<application>biber</application>, <application>dvisvgm</application> or
<application>xindy</application>) have been installed, you will need to
@@ -257,6 +257,35 @@
# End texlive &texlive-year; addition</literal>
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. -->
+<screen><userinput>SYSPOP= &&
+let MYPOPPLER_MAJOR=$(pkg-config --modversion poppler | cut -d '.' -f1)
+let MYPOPPLER_MINOR=$(pkg-config --modversion poppler | cut -d '.' -f2)
+if [ "$MYPOPPLER_MAJOR" -eq 0 ] && [ "$MYPOPPLER_MINOR" -lt 85 ]; then
+ # BLFS-9.1 uses 0.85.0, ignore earlier versions in this script.
+ SYSPOP=
+else
+ SYSPOP="--with-system-poppler --with-system-xpdf"
+ if [ "$MYPOPPLER_MAJOR" -eq 0 ] && [ "$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 &&
+export SYSPOP &&
+unset MYPOPPLER_{MAJOR,MINOR}</userinput></screen>
+
<note>
<para>
A successful install requires some texlive
@@ -270,12 +299,6 @@
</para>
<!-- after the export!
patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch
&&-->
-
-<!-- System poppler was removed from upstream in
- https://tug.org/svn/texlive?view=revision&revision=55138
- so for remaining lifetime of TL2020 use its shipped version
- because it does not build with current system poppler -->
-
<screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e
's/$/-linux/') &&
mkdir texlive-build &&
@@ -304,10 +327,12 @@
--with-system-libpng \
--with-system-mpfr \
--with-system-pixman \
+ ${SYSPOP} \
--with-system-zlib \
--with-banner-add=" - BLFS" &&
-make</userinput></screen>
+make &&
+unset SYSPOP</userinput></screen>
<para>
To test the results, issue: <command>make -k check</command>.
Modified: trunk/BOOK/xincludes/texrecommendlibs.xml
==============================================================================
--- trunk/BOOK/xincludes/texrecommendlibs.xml Thu Aug 13 05:42:00 2020
(r23507)
+++ trunk/BOOK/xincludes/texrecommendlibs.xml Thu Aug 13 06:14:57 2020
(r23508)
@@ -17,8 +17,7 @@
<xref linkend="harfbuzz"/> (built with graphite2 enabled),
<xref linkend="icu"/>,
<xref linkend="libpaper"/> (used by at least context and xelatex),
- and <xref linkend="libpng"/>
-<!-- System poppler was removed from upstream in
- https://tug.org/svn/texlive?view=revision&revision=55138
- so for remaining lifetime of TL2020 use its shipepd version -->
+ and <xref linkend="libpng"/>, also
+ <xref linkend="poppler"/> (only used if suitable file versions
+ are available in <filename class="directory">texk/web2c/pdftexdir</filename>)
</para>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
