Changeset ddd5a70

Timestamp:

09/20/2020 09:15:42 AM (4 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.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:

204252e

Parents:

06a9f57

Message:

Patch gtk-doc and glib2 to prevent glib2 from downloading a develoment
version of gtk-doc when building the docs

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

Files:

• general.ent (modified) (2 diffs)
• general/genlib/glib2.xml (modified) (1 diff)
• general/genutils/gtk-doc.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "19">                   <!-- Always 2 digits -->
+<!ENTITY day          "20">                   <!-- Always 2 digits -->
 <!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2020">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "September 19th, &year;">
+<!ENTITY releasedate  "September 20th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

general/genlib/glib2.xml

@@ -163 +163 @@
 
     </warning>
-    
+
+<!-- Hopefully shouldn't be needed when gtk-doc 1.33 is released -->
+    <para>
+      Prevent the build system from downloading a develoment version of
+      <xref linkend="gtk-doc"/>:
+    </para>
+
+<screen><userinput>sed -i 's/1\.32\.1/1.32/' docs/reference/meson.build</userinput></screen>
+      
     <para>
       Install <application>GLib</application> by running the following

general/genutils/gtk-doc.xml

@@ -73 +73 @@
         <para>
           Estimated build time: &gtk-doc-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch to allow building <xref linkend="glib2"/>
+          documentation:
+          <ulink url="&patch-root;/gtk-doc-&gtk-doc-version;-glib2_fixes-1.patch"/>
         </para>
       </listitem>
@@ -119 +130 @@
   <sect2 role="installation">
     <title>Installation of GTK-Doc</title>
+
+    <para>
+      Apply a fix for building Glib2 documentation:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../gtk-doc-&gtk-doc-version;-glib2_fixes-1.patch</userinput></screen>
 
     <para>

introduction/welcome/changelog.xml

@@ -43 +43 @@
     -->
     <listitem>
+      <para>September 20th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Patch gtk-doc so that glib2 can be built without
+          downloading a development version of gtk-doc.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>September 19th, 2020</para>
       <itemizedlist>