Changeset 07f61e4

Timestamp:

05/12/2019 03:02:34 PM (5 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 9.0, 9.1, 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/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

baa0c93f

Parents:

5532a041

Message:

Add Pygments module and disable doc for libical: required by gtk-doc-1.30.
Fixes ticket 12053

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

Files:

• general/genlib/libical.xml (modified) (5 diffs)
• general/genutils/gtk-doc.xml (modified) (2 diffs)
• general/prog/mercurial.xml (modified) (1 diff)
• general/prog/pygments.xml (added)
• general/prog/python-modules.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

general/genlib/libical.xml

@@ -106 +106 @@
       -DCMAKE_BUILD_TYPE=Release       \
       -DSHARED_ONLY=yes                \
+      -DICAL_BUILD_DOCS=false          \
       .. &&
 make</userinput></screen>
-
+<!-- DEVS: the ICAL_BUILD_DOCS=false switch is needed because gtk-doc-1.30 is
+     broken. Unfortunately, it also prevents running make docs. When gtk-doc
+     is fixed, remove the switch and uncomment this.
     <para>
       If you have <xref linkend="doxygen"/> installed and wish to build the API
@@ -115 +118 @@
 
 <screen><userinput>make docs</userinput></screen>
-
+-->
     <para>
       To test the results, issue: <command>make test</command>.
@@ -128 +131 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
+<!-- see above:
     <para>
       If you have built the API documentation, install by issuing, as
@@ -136 +139 @@
 <screen role="root"><userinput>install -vdm755 /usr/share/doc/libical-&libical-version;/html &amp;&amp;
 cp -vr apidocs/html/* /usr/share/doc/libical-&libical-version;/html</userinput></screen>
-
+-->
   </sect2>
 
@@ -150 +153 @@
       <parameter>-DSHARED_ONLY=yes</parameter>: This switch is used
       in order to only build the shared libraries.
+    </para>
+
+    <para>
+      <parameter>-DICAL_BUILD_DOCS=false</parameter>: This switch prevents
+      building the <application>GTK</application> documentation, because
+      gtk-doc-1.30 is broken. Unfortunately, it also prevents building the
+      API documentation.
     </para>
 

general/genutils/gtk-doc.xml

@@ -65 +65 @@
     <bridgehead renderas="sect3">GTK-Doc Dependencies</bridgehead>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref role="runtime" linkend="pygments"/> at run time
+    </para>
+
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
@@ -81 +86 @@
       <xref linkend="which"/>, and
       Python modules 
-      <ulink url="http://pygments.org/">pygments</ulink>,
       <ulink url="https://anytree.readthedocs.io/en/latest/">anytree</ulink>, and
       <ulink url="https://pypi.org/project/parameterized/">paramerterized</ulink>

general/prog/mercurial.xml

@@ -75 +75 @@
     <xref role="runtime" linkend="openssh"/>
       (runtime, to access ssh://... repositories),
+    <xref linkend="pygments"/>,
     <xref linkend="subversion"/> (with Python bindings),
     <ulink url="https://launchpad.net/bzr">Bazaar</ulink>,
     <ulink url="http://www.nongnu.org/cvs/">CVS</ulink>,
-    <ulink url="https://pypi.python.org/pypi/pyflakes">pyflakes</ulink>,
-    <ulink url="http://pygments.org/">pygments</ulink>, and
+    <ulink url="https://pypi.python.org/pypi/pyflakes">pyflakes</ulink>, and
     <ulink url="https://github.com/pyca/pyopenssl">pyOpenSSL</ulink>
 

general/prog/python-modules.xml

@@ -57 +57 @@
       <listitem>
         <para>
+          <xref linkend="pygments"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <xref linkend="pygobject2"/>
         </para>
@@ -147 +152 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="pygments.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="pygobject2.xml"/>
 

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <para>May 12th, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[pierre] - Disable building documentation for libical, since
+          gtk-doc-1.30 has broken it.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Add Pygments-2.4.0, needed by gtk-doc-1.30. Fixes
+          <ulink url="&blfs-ticket-root;12053">#12053</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[thomas] - Update to nfs-utils-2.3.4. Fixes

packages.ent

@@ -528 +528 @@
 <!ENTITY pycairo-version              "1.18.1">
 <!ENTITY pycrypto-version             "2.6.1">
+<!ENTITY pygments-version             "2.4.0">
 <!ENTITY pygobject2-version           "2.28.7">
 <!ENTITY pygobject3-version           "3.32.1">