[blfs-book] r9531 - in trunk/BOOK: . gnome/add introduction/welcome

ken at linuxfromscratch.org ken at linuxfromscratch.org
Mon Feb 27 08:35:13 PST 2012


Author: ken
Date: 2012-02-27 09:35:09 -0700 (Mon, 27 Feb 2012)
New Revision: 9531

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/gnome/add/gtkhtml.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
libgtkhtml-4.2.2

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-02-27 01:07:55 UTC (rev 9530)
+++ trunk/BOOK/general.ent	2012-02-27 16:35:09 UTC (rev 9531)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "27">                   <!-- Always 2 digits -->
+<!ENTITY day          "28">                   <!-- Always 2 digits -->
 <!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "February 27th, &year;">
+<!ENTITY releasedate  "February 28th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -764,7 +764,7 @@
 <!ENTITY gdlmm-version                "3.2.1">
 <!ENTITY gnome-applets-version        "3.2.1">
 <!ENTITY gnome-video-effects-version  "0.3.0">
-<!ENTITY gtkhtml-version              "3.30.2">
+<!ENTITY gtkhtml-version              "4.2.2">
 <!ENTITY gtksourceview-version        "3.2.3">
 <!ENTITY libgda-version               "4.2.4">
 <!ENTITY mobile-broadband-provider-info-version "20110511">

Modified: trunk/BOOK/gnome/add/gtkhtml.xml
===================================================================
--- trunk/BOOK/gnome/add/gtkhtml.xml	2012-02-27 01:07:55 UTC (rev 9530)
+++ trunk/BOOK/gnome/add/gtkhtml.xml	2012-02-27 16:35:09 UTC (rev 9531)
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-<!ENTITY gtkhtml-download-http "&gnome-download-http;/gtkhtml/3.30/gtkhtml-&gtkhtml-version;.tar.bz2">
-<!ENTITY gtkhtml-download-ftp  "&gnome-download-http;/gtkhtml/3.30/gtkhtml-&gtkhtml-version;.tar.bz2">
-<!ENTITY gtkhtml-md5sum        "590c626e507a2ef9c9026699283d4004">
-<!ENTITY gtkhtml-size          "1.3 MB">
-<!ENTITY gtkhtml-buildsize     "36 MB">
+<!ENTITY gtkhtml-download-http "&gnome-download-http;/gtkhtml/4.2/gtkhtml-&gtkhtml-version;.tar.xz">
+<!ENTITY gtkhtml-download-ftp  "&gnome-download-http;/gtkhtml/4.2/gtkhtml-&gtkhtml-version;.tar.xz">
+<!ENTITY gtkhtml-md5sum        "9296c0c1863ae34409ab6c403f4f3783">
+<!ENTITY gtkhtml-size          "1.1 MB">
+<!ENTITY gtkhtml-buildsize     "41 MB">
 <!ENTITY gtkhtml-time          "0.7 SBU">
 ]>
 
@@ -32,7 +32,7 @@
     <para>The <application>GtkHTML</application> package contains a
     lightweight HTML rendering/printing/editing engine.</para>
 
-    &lfs65_built;
+    &lfs70_built;
 
     <!-- Gnome-Sharp can use this package, and Beagle can use these
          extensions, so I suppose this package is no longer
@@ -67,13 +67,14 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="enchant"/>,
-    <xref linkend="GConf"/>,
     <xref linkend="gnome-icon-theme"/>,
-    <xref linkend="gtk2"/>, and
+    <xref linkend="gsettings-desktop-schemas"/>,
+    <xref linkend="gtk3"/>,
     <xref linkend="iso-codes"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libsoup"/></para>
+    <para role="optional"><xref linkend="libsoup"/>,
+    <xref linkend="xorg7"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gtkhtml"/></para>
@@ -86,9 +87,7 @@
     <para>Install <application>GtkHTML</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/gtkhtml &&
+<screen><userinput>./configure --prefix=$GNOME_PREFIX &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -105,12 +104,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/gtkhtml</parameter>: This parameter causes the libexec
-    files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/gtkhtml</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
   </sect2>
 
   <sect2 role="content">
@@ -123,9 +116,9 @@
 
       <seglistitem>
         <seg>gtkhtml-editor-test</seg>
-        <seg>libgtkhtml-3.14.so and libgtkhtml-editor.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/libgtkhtml-3.14/{editor,
-        gtkhtml},share/gtkhtml-3.14/icons}</seg>
+        <seg>libgtkhtml-4.0.so and libgtkhtml-editor-4.0.so</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/{include/libgtkhtml-4.0/{editor,
+        gtkhtml},share/gtkhtml-4.0/icons}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -145,11 +138,11 @@
       </varlistentry>
 
       <varlistentry id="libgtkhtml-3">
-        <term><filename class='libraryfile'>libgtkhtml-3.14.so</filename></term>
+        <term><filename class='libraryfile'>libgtkhtml-4.0.so</filename></term>
         <listitem>
-          <para>provide the functions to render HTML within applications.</para>
+          <para>provides the functions to render HTML within applications.</para>
           <indexterm zone="gtkhtml libgtkhtml-3">
-            <primary sortas="c-libgtkhtml-3">libgtkhtml-3.14.so</primary>
+            <primary sortas="c-libgtkhtml-3">libgtkhtml-4.0.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2012-02-27 01:07:55 UTC (rev 9530)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2012-02-27 16:35:09 UTC (rev 9531)
@@ -42,6 +42,15 @@
 
 -->
     <listitem>
+      <para>February 28th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - merged gtkhtml-4.2.2 from Wayne.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>February 27th, 2012</para>
       <itemizedlist>
         <listitem>




More information about the blfs-book mailing list