Changeset 64c6acb

Timestamp:

01/20/2009 04:58:14 PM (15 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/inkscape-core-mods, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/python-mods, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

cc60178

Parents:

5fb773fe

Message:

Update gtk-doc.

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

Files:

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

general.ent

@@ -4 +4 @@
 -->
 
-<!ENTITY day          "17">                   <!-- Always 2 digits -->
+<!ENTITY day          "20">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2009">
@@ -172 +172 @@
 <!ENTITY imagemagick-version          "6.3.5">
 <!ENTITY hd2u-version                 "1.0.1">
-<!ENTITY gtk-doc-version              "1.8">
+<!ENTITY gtk-doc-version              "1.11">
 <!ENTITY scrollkeeper-version         "0.3.14">
 <!ENTITY intltool-version             "0.40.5">

general/genutils/gtk-doc.xml

@@ -7 +7 @@
   <!ENTITY gtk-doc-download-http "&gnome-download-http;/gtk-doc/&gtk-doc-version;/gtk-doc-&gtk-doc-version;.tar.bz2">
   <!ENTITY gtk-doc-download-ftp  "&gnome-download-ftp;/gtk-doc/&gtk-doc-version;/gtk-doc-&gtk-doc-version;.tar.bz2">
-  <!ENTITY gtk-doc-md5sum        "e61595df21431db28c83fe4c7d4a4fa8">
-  <!ENTITY gtk-doc-size          "186 KB">
-  <!ENTITY gtk-doc-buildsize     "2 MB">
+  <!ENTITY gtk-doc-md5sum        "b5e268c71fa90aad890cf53715664d0a">
+  <!ENTITY gtk-doc-size          "443 KB">
+  <!ENTITY gtk-doc-buildsize     "4.8 MB">
   <!ENTITY gtk-doc-time          "less than 0.1 SBU">
 ]>
@@ -68 +68 @@
     <xref linkend="docbook-xsl"/></para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="optional"><xref linkend="python"/></para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="pkgconfig"/>,
     <xref linkend="scrollkeeper"/>,
     <xref linkend="openjade"/>,
-    <xref linkend="sgml-dtd"/>, and
-    <xref linkend="docbook-dsssl"/></para>
+    <xref linkend="sgml-dtd"/>,
+    <xref linkend="docbook-dsssl"/>, also
+    <xref linkend="glib2"/> (for the testsuite)</para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -86 +90 @@
     the following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --localstatedir=/var/lib &amp;&amp;
+<screen><userinput>sed -i '/^pkgconfigdir/s/datadir/libdir/' &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+    <para>The test suite requires that the package has been installed first, and
+    in any case it fails because of a missing file, so there is little point
+    in running it.  If you insist on seeing the results, as a normal user run:
+    <command>make check</command>.</para>
 
   </sect2>
@@ -100 +108 @@
     <title>Command Explanations</title>
 
+    <para><command>sed -i '/^pkgconfigdir/s/datadir/libdir/'</command>:
+    this installs the pkgconfig file in a place which is on
+    <envar>PKG_CONFIG_PATH</envar> instead of in
+    <filename class='directory'>/usr/share/pkgconfig</filename>.</para>
+
+    <!-- no scrollkeeper files with this version
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
+    href="../../xincludes/scrollkeeper-dir.xml"/>-->
 
   </sect2>
@@ -114 +128 @@
 
       <seglistitem>
-        <seg>gtkdocize, gtkdoc-fixxref, gtkdoc-mkdb, gtkdoc-mkhtml, gtkdoc-mkman,
-        gtkdoc-mktmpl, gtkdoc-scan, gtkdoc-scangobj, and gtkdoc-scanobj</seg>
+        <seg>gtkdocize, gtkdoc-check, gtkdoc-depscan, gtkdoc-fixxref, gtkdoc-mkdb,
+        gtkdoc-mkhtml, gtkdoc-mkman, gtkdoc-mktmpl, gtkdoc-rebase, gtkdoc-scan,
+        gtkdoc-scangobj, and gtkdoc-scanobj</seg>
         <seg>None</seg>
         <seg>The following subdirectories of /usr/share/:
-        doc/gtk-doc-&gtk-doc-version;,
+        <!--doc/gtk-doc-&gtk-doc-version;, -->
         gnome/help/gtk-doc-manual,
         gtk-doc/data and
@@ -133 +148 @@
         <term><command>gtkdoc*</command></term>
         <listitem>
-          <para>these are all <application>Perl</application> scripts used by
+          <para>these are all shell, <application>Perl</application>, or
+          <application>Python</application> scripts used by
           package <filename>Makefile</filename> scripts to generate
           documentation for the package being built.</para>

introduction/welcome/changelog.xml

@@ -42 +42 @@
 -->
     <listitem>
+      <para>January 20th, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Updated to gtk-doc-1.11.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 17th, 2009</para>
       <itemizedlist>