Changeset e3dfe5e for pst/typesetting/texlive.xml

Timestamp:

08/12/2020 09:06:02 PM (3 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, ken/inkscape-core-mods, lazarus, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

fd973b8

Parents:

511fbee9

Message:

TexLive source: remove system poppler option.

Fails to build with current poppler, and upstream has removed poppler for TL2021.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23505 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• pst/typesetting/texlive.xml (modified) (5 diffs)

pst/typesetting/texlive.xml

@@ -223 +223 @@
 
     <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.
@@ -232 +232 @@
         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>
+      </para>-->
+
+      <para>
+        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
@@ -258 +258 @@
 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= &amp;&amp;
-let MYPOPPLER=$(pkg-config --modversion poppler | cut -d '.' -f2)
-if [ "$MYPOPPLER" -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 --with-system-potrace"
-    if [ $MYPOPPLER -lt 86 ]; then
-        mv -v texk/web2c/pdftexdir/pdftoepdf{-poppler0.83.0,}.cc
-    else # 0.86.0 or later.
-        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</userinput></screen>
-
     <note>
       <para>
@@ -299 +271 @@
 <!-- after the export!
 patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch &amp;&amp;-->
+
+<!-- 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/') &amp;&amp;
 
@@ -327 +305 @@
     --with-system-mpfr                                          \
     --with-system-pixman                                        \
-    ${SYSPOP}                                                   \
     --with-system-zlib                                          \
     --with-banner-add=" - BLFS" &amp;&amp;
 
-make &amp;&amp;
-unset SYSPOP</userinput></screen>
+make</userinput></screen>
 
     <para>