[blfs-book] r23505 - in trunk/BOOK: introduction/welcome pst/typesetting xincludes

[ken--- via blfs-book]

Author: ken
Date: Wed Aug 12 14:06:02 2020
New Revision: 23505

Log:
TexLive source: remove system poppler option. 

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

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/pst/typesetting/texlive.xml
   trunk/BOOK/xincludes/texrecommendlibs.xml

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Wed Aug 12 13:44:58 
2020        (r23504)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Wed Aug 12 14:06:02 
2020        (r23505)
@@ -45,6 +45,10 @@
       <para>August 12th, 2020</para>
       <itemizedlist>
         <listitem>
+          <para>[ken] - Fix texlive build failure with poppler-20.08
+          by removing instructions to use system poppler.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Adapt the Lua-5.4 sed in VIM to the latest version
           of VIM.</para>
         </listitem>

Modified: trunk/BOOK/pst/typesetting/texlive.xml
==============================================================================
--- trunk/BOOK/pst/typesetting/texlive.xml      Wed Aug 12 13:44:58 2020        
(r23504)
+++ trunk/BOOK/pst/typesetting/texlive.xml      Wed Aug 12 14:06:02 2020        
(r23505)
@@ -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 &gt;= 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>
-        Similarly, if you wish to upgrade to current 
<application>texlive</application>
+        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,34 +257,6 @@
 # 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= &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>
         A successful install requires some texlive
@@ -298,6 +270,12 @@
     </para>
 <!-- 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;
 
 mkdir texlive-build &amp;&amp;
@@ -326,12 +304,10 @@
     --with-system-libpng                                        \
     --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>
       To test the results, issue: <command>make -k check</command>.

Modified: trunk/BOOK/xincludes/texrecommendlibs.xml
==============================================================================
--- trunk/BOOK/xincludes/texrecommendlibs.xml   Wed Aug 12 13:44:58 2020        
(r23504)
+++ trunk/BOOK/xincludes/texrecommendlibs.xml   Wed Aug 12 14:06:02 2020        
(r23505)
@@ -17,8 +17,8 @@
   <xref linkend="harfbuzz"/> (built with graphite2 enabled),
   <xref linkend="icu"/>,
   <xref linkend="libpaper"/> (used by at least context and xelatex),
-   and <xref linkend="libpng"/>, also
-  <xref linkend="poppler"/> and
-  <xref linkend="potrace"/> (both only used if suitable file versions
-  are available in <filename class="directory">texk/web2c/pdftexdir</filename>)
+   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 -->
 </para>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page