Author: dj
Date: Wed Oct 25 22:30:30 2017
New Revision: 19382

Log:
Move GtkHTML to genutils, and fix build error with newer enchant.

Added:
   trunk/BOOK/general/genutils/gtkhtml.xml   (contents, props changed)
      - copied, changed from r19381, trunk/BOOK/gnome/platform/gtkhtml.xml
Deleted:
   trunk/BOOK/gnome/platform/gtkhtml.xml
Modified:
   trunk/BOOK/general/genutils/genutils.xml
   trunk/BOOK/gnome.ent
   trunk/BOOK/gnome/platform/platform.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/packages.ent

Modified: trunk/BOOK/general/genutils/genutils.xml
==============================================================================
--- trunk/BOOK/general/genutils/genutils.xml    Wed Oct 25 20:31:11 2017        
(r19381)
+++ trunk/BOOK/general/genutils/genutils.xml    Wed Oct 25 22:30:30 2017        
(r19382)
@@ -30,6 +30,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="desktop-file-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="graphviz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gtk-doc.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gtkhtml.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="hd2u.xml"/>
 
   <!-- systemd only -->

Copied and modified: trunk/BOOK/general/genutils/gtkhtml.xml (from r19381, 
trunk/BOOK/gnome/platform/gtkhtml.xml)
==============================================================================
--- trunk/BOOK/gnome/platform/gtkhtml.xml       Wed Oct 25 20:31:11 2017        
(r19381, copy source)
+++ trunk/BOOK/general/genutils/gtkhtml.xml     Wed Oct 25 22:30:30 2017        
(r19382)
@@ -99,6 +99,12 @@
     <title>Installation of GtkHTML</title>
 
     <para>
+      Fix a build issue with <xref linkend="enchant"/>:
+    </para>
+
+<screen><userinput>sed 's@pwl@session@' -i 
components/editor/gtkhtml-spell-checker.c</userinput></screen>
+
+    <para>
       Install <application>GtkHTML</application> by running the following
       commands:
     </para>

Modified: trunk/BOOK/gnome.ent
==============================================================================
--- trunk/BOOK/gnome.ent        Wed Oct 25 20:31:11 2017        (r19381)
+++ trunk/BOOK/gnome.ent        Wed Oct 25 22:30:30 2017        (r19382)
@@ -33,7 +33,6 @@
 <!ENTITY libpeas-version                   "1.20.0">
 <!ENTITY libwnck-version                   "3.24.1">
 <!ENTITY grilo-version                     "0.3.4">
-<!ENTITY gtkhtml-version                   "4.10.0">
 <!ENTITY libchamplain-version              "0.12.16">
 <!ENTITY libgdata-version                  "0.17.9">
 <!ENTITY libgee-version                    "0.20.0">

Modified: trunk/BOOK/gnome/platform/platform.xml
==============================================================================
--- trunk/BOOK/gnome/platform/platform.xml      Wed Oct 25 20:31:11 2017        
(r19381)
+++ trunk/BOOK/gnome/platform/platform.xml      Wed Oct 25 22:30:30 2017        
(r19382)
@@ -56,7 +56,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="gnome-online-accounts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="gnome-video-effects.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="grilo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gtkhtml.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libchamplain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libgdata.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libgee.xml"/>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Wed Oct 25 20:31:11 
2017        (r19381)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Wed Oct 25 22:30:30 
2017        (r19382)
@@ -45,6 +45,10 @@
       <para>October 26th, 2017</para>
       <itemizedlist>
         <listitem>
+          <para>[dj] - Move GtkHTML to genutils, and fix build error with
+          newer enchant.</para>
+        </listitem>
+        <listitem>
           <para>[dj] - Update to gnome-online-accounts-3.26.1.</para>
         </listitem>
         <listitem>

Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent     Wed Oct 25 20:31:11 2017        (r19381)
+++ trunk/BOOK/packages.ent     Wed Oct 25 22:30:30 2017        (r19382)
@@ -229,6 +229,7 @@
 <!ENTITY gperf-version                "3.0.4">
 <!ENTITY graphviz-version             "2.40.1">   <!-- Even minors only -->
 <!ENTITY gtk-doc-version              "1.26">
+<!ENTITY gtkhtml-version              "4.10.0">
 <!ENTITY hd2u-version                 "1.0.4">
 <!ENTITY hicolor-icon-theme-version   "0.17">
 <!ENTITY icon-naming-utils-version    "0.8.90">
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to