Changeset f95e1c8d

Timestamp:

01/27/2019 04:41:48 PM (6 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 8.4, 9.0, 9.1, gimp3, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

fccc8d97

Parents:

4f8ca94

Message:

Fix Poppler dep on Python

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

Files:

• general/graphlib/poppler.xml (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (2 diffs)

general/graphlib/poppler.xml

@@ -133 +133 @@
       <xref linkend="libjpeg"/>,
       <xref linkend="libpng"/>,
-      <xref linkend="nss"/>, 
-      <xref linkend="openjpeg2"/>, and 
-      <xref linkend="python2"/>
+      <xref linkend="nss"/>, and
+      <xref linkend="openjpeg2"/>
     </para>
 
@@ -147 +146 @@
       <xref linkend="gtk3"/>,
       <xref linkend="libtiff"/>,
+      <xref linkend="python2"/>, and
       <xref linkend="qt5"/>
       (required for PDF support in <xref role="nodep" linkend="okular5"/>)
@@ -244 +244 @@
     </para>
 <!--  This was broken for me - Bruce
+      Still broken with 0.69.0 - Doug
+      Seems to work with 0.73.0 - Pierre -->
     <para>
       <option>-DENABLE_GTK_DOC=ON</option>: Use this parameter if 
       GTK-Doc is installed and you wish to rebuild and install 
-      the API documentation.
-    </para>
-    Still broken with 0.69.0 - Doug
--->
+      the API documentation. If Python 2 is not installed, one script
+      needs to be changed: run <command>sed -i '1s/python/&amp;3/'
+      make-glib-api-docs</command> first.
+    </para>
+
     <para>
       <command>LC_ALL=en_US.UTF-8 make test</command>: Run the test suite.

introduction/welcome/changelog.xml

@@ -47 +47 @@
       <itemizedlist>
         <listitem>
+          <para>[pierre] - Poppler needs Python only for generating
+          the API documentation.  Make dependency on Python 2 optional,
+          and document how to use Python 3.</para>
+        </listitem>
+        <listitem>
           <para>[pierre] - Git barely needs Python, and
           can use Python 3 in the rare cases it is needed.</para>
@@ -57 +62 @@
 
     <listitem>
-      <para>January 24th, 2019</para>
+      <para>January 26th, 2019</para>
       <itemizedlist>
         <listitem>