Author: krejzi
Date: 2012-04-16 11:06:53 -0600 (Mon, 16 Apr 2012)
New Revision: 9923

Added:
   trunk/BOOK/x/lib/gtkmm3.xml
Removed:
   trunk/BOOK/x/lib/gtkmm.xml
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genlib/glibmm.xml
   trunk/BOOK/general/genlib/gobject-introspection.xml
   trunk/BOOK/gnome/add/gdlmm.xml
   trunk/BOOK/gnome/add/gtksourceviewmm.xml
   trunk/BOOK/gnome/add/nemiver.xml
   trunk/BOOK/gnome/core/gnome-system-monitor.xml
   trunk/BOOK/gnome/core/gsettings-desktop-schemas.xml
   trunk/BOOK/x/lib/atk.xml
   trunk/BOOK/x/lib/atkmm.xml
   trunk/BOOK/x/lib/cairo.xml
   trunk/BOOK/x/lib/cairomm.xml
   trunk/BOOK/x/lib/cogl.xml
   trunk/BOOK/x/lib/gtk+3.xml
   trunk/BOOK/x/lib/gtkmm2.xml
   trunk/BOOK/x/lib/lib.xml
   trunk/BOOK/x/lib/pangomm.xml
Log:
GTK+3 XML fixes, moved gtkmm.xml to gtkmm3.xml and some other xml fixes

Modified: trunk/BOOK/general/genlib/glibmm.xml
===================================================================
--- trunk/BOOK/general/genlib/glibmm.xml        2012-04-16 16:14:42 UTC (rev 
9922)
+++ trunk/BOOK/general/genlib/glibmm.xml        2012-04-16 17:06:53 UTC (rev 
9923)
@@ -90,15 +90,11 @@
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          None
-        </seg>
-        <seg>
           libgiomm-2.4.so, libglibmm-2.4.so and
           libglibmm_generate_extra_defs-2.4.so
         </seg>

Modified: trunk/BOOK/general/genlib/gobject-introspection.xml
===================================================================
--- trunk/BOOK/general/genlib/gobject-introspection.xml 2012-04-16 16:14:42 UTC 
(rev 9922)
+++ trunk/BOOK/general/genlib/gobject-introspection.xml 2012-04-16 17:06:53 UTC 
(rev 9923)
@@ -6,8 +6,10 @@
 
   <!-- Note gobject-introspection-1.30+ is incompatible with other BLFS 
packages-->
 
-  <!ENTITY gobject-introspection-download-http 
"&gnome-download-http;/gobject-introspection/1.32/gobject-introspection-&gobject-introspection-version;.tar.xz">
-  <!ENTITY gobject-introspection-download-ftp  
"&gnome-download-ftp;/gobject-introspection/1.32/gobject-introspection-&gobject-introspection-version;.tar.xz">
+  <!ENTITY gobject-introspection-download-http 
+           
"&gnome-download-http;/gobject-introspection/1.32/gobject-introspection-&gobject-introspection-version;.tar.xz">
+  <!ENTITY gobject-introspection-download-ftp  
+           
"&gnome-download-ftp;/gobject-introspection/1.32/gobject-introspection-&gobject-introspection-version;.tar.xz">
   <!ENTITY gobject-introspection-md5sum        
"d0e8266f14063160770aece127211772">
   <!ENTITY gobject-introspection-size          "1.1 MB">
   <!ENTITY gobject-introspection-buildsize     "40 MB">

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2012-04-16 16:14:42 UTC (rev 9922)
+++ trunk/BOOK/general.ent      2012-04-16 17:06:53 UTC (rev 9923)
@@ -617,8 +617,8 @@
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">
 <!ENTITY gtk3-version                 "3.4.1">
 <!ENTITY gtk-engines-version          "2.20.1">
-<!ENTITY gtkmm-version                "3.4.0">
 <!ENTITY gtkmm2-version               "2.24.2">
+<!ENTITY gtkmm3-version               "3.4.0">
 <!ENTITY lesstif-version              "0.95.2">
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY libwnck-version              "3.2.1">

Modified: trunk/BOOK/gnome/add/gdlmm.xml
===================================================================
--- trunk/BOOK/gnome/add/gdlmm.xml      2012-04-16 16:14:42 UTC (rev 9922)
+++ trunk/BOOK/gnome/add/gdlmm.xml      2012-04-16 17:06:53 UTC (rev 9923)
@@ -61,7 +61,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="gdl"/>,
     <xref linkend="glibmm"/>, and
-    <xref linkend="gtkmm"/></para>
+    <xref linkend="gtkmm3"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="doxygen"/>,

Modified: trunk/BOOK/gnome/add/gtksourceviewmm.xml
===================================================================
--- trunk/BOOK/gnome/add/gtksourceviewmm.xml    2012-04-16 16:14:42 UTC (rev 
9922)
+++ trunk/BOOK/gnome/add/gtksourceviewmm.xml    2012-04-16 17:06:53 UTC (rev 
9923)
@@ -60,7 +60,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="gtksourceview"/> and
-    <xref linkend="gtkmm"/></para>
+    <xref linkend="gtkmm3"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gtksourceviewmm"/></para>

Modified: trunk/BOOK/gnome/add/nemiver.xml
===================================================================
--- trunk/BOOK/gnome/add/nemiver.xml    2012-04-16 16:14:42 UTC (rev 9922)
+++ trunk/BOOK/gnome/add/nemiver.xml    2012-04-16 17:06:53 UTC (rev 9923)
@@ -63,7 +63,7 @@
     <xref linkend="gdlmm"/>,
     <xref linkend="ghex"/>,
     <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gtkmm"/>,
+    <xref linkend="gtkmm3"/>,
     <xref linkend="gtksourceviewmm"/>,
     <xref linkend="libgtop"/>,
     <xref linkend="libxml2"/>, and

Modified: trunk/BOOK/gnome/core/gnome-system-monitor.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-system-monitor.xml      2012-04-16 16:14:42 UTC 
(rev 9922)
+++ trunk/BOOK/gnome/core/gnome-system-monitor.xml      2012-04-16 17:06:53 UTC 
(rev 9923)
@@ -66,7 +66,7 @@
     <para role="required"><xref linkend="GConf"/>,
     <xref linkend="gnome-doc-utils"/>,
     <xref linkend="gnome-icon-theme"/>,
-    <xref linkend="gtkmm"/>,
+    <xref linkend="gtkmm3"/>,
     <xref linkend="libgtop"/>,
     <xref linkend="librsvg"/>,
     <xref linkend="libwnck"/>, and

Modified: trunk/BOOK/gnome/core/gsettings-desktop-schemas.xml
===================================================================
--- trunk/BOOK/gnome/core/gsettings-desktop-schemas.xml 2012-04-16 16:14:42 UTC 
(rev 9922)
+++ trunk/BOOK/gnome/core/gsettings-desktop-schemas.xml 2012-04-16 17:06:53 UTC 
(rev 9923)
@@ -98,18 +98,10 @@
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
           /usr/include/gsettings-desktop-schemas
        </seg>
       </seglistitem>

Modified: trunk/BOOK/x/lib/atk.xml
===================================================================
--- trunk/BOOK/x/lib/atk.xml    2012-04-16 16:14:42 UTC (rev 9922)
+++ trunk/BOOK/x/lib/atk.xml    2012-04-16 17:06:53 UTC (rev 9923)
@@ -110,15 +110,11 @@
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          None
-        </seg>
-        <seg>
           libatk-1.0.so
         </seg>
         <seg>

Modified: trunk/BOOK/x/lib/atkmm.xml
===================================================================
--- trunk/BOOK/x/lib/atkmm.xml  2012-04-16 16:14:42 UTC (rev 9922)
+++ trunk/BOOK/x/lib/atkmm.xml  2012-04-16 17:06:53 UTC (rev 9923)
@@ -90,15 +90,11 @@
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          None
-        </seg>
-        <seg>
           libatkmm-1.6.so
         </seg>
         <seg>

Modified: trunk/BOOK/x/lib/cairo.xml
===================================================================
--- trunk/BOOK/x/lib/cairo.xml  2012-04-16 16:14:42 UTC (rev 9922)
+++ trunk/BOOK/x/lib/cairo.xml  2012-04-16 17:06:53 UTC (rev 9923)
@@ -177,7 +177,7 @@
 
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>

Modified: trunk/BOOK/x/lib/cairomm.xml
===================================================================
--- trunk/BOOK/x/lib/cairomm.xml        2012-04-16 16:14:42 UTC (rev 9922)
+++ trunk/BOOK/x/lib/cairomm.xml        2012-04-16 17:06:53 UTC (rev 9923)
@@ -96,15 +96,11 @@
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          None
-        </seg>
-        <seg>
           libcairomm-1.0.so
         </seg>
         <seg>

Modified: trunk/BOOK/x/lib/cogl.xml
===================================================================
--- trunk/BOOK/x/lib/cogl.xml   2012-04-16 16:14:42 UTC (rev 9922)
+++ trunk/BOOK/x/lib/cogl.xml   2012-04-16 17:06:53 UTC (rev 9923)
@@ -20,14 +20,14 @@
     <date>$Date$</date>
   </sect1info>
 
-  <title>cogl-&cogl-version;</title>
+  <title>Cogl-&cogl-version;</title>
 
   <indexterm zone="cogl">
     <primary sortas="a-cogl">cogl</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to cogl</title>
+    <title>Introduction to Cogl</title>
 
     <para><application>Cogl</application> Cogl is a modern 3D graphics API with
     associated utility APIs designed to expose the features of 3D graphics 
hardware
@@ -58,18 +58,25 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">cogl Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Cogl Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gdk-pixbuf"/>,
-    <xref linkend="mesalib"/> and <xref linkend="pango"/>.</para>
+    <para role="required">
+      <xref linkend="gdk-pixbuf"/>,
+      <xref linkend="mesalib"/> and
+      <xref linkend="pango"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="gobject-introspection"/>
-    (Required if building GNOME)</para>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+      (Required if building GNOME)
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/></para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/cogl"/></para>
@@ -77,9 +84,9 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of cogl</title>
+    <title>Installation of Cogl</title>
 
-    <para>Install <application>cogl</application> by running the following
+    <para>Install <application>Cogl</application> by running the following
     commands:</para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
@@ -105,20 +112,16 @@
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-
         <seg>
           libcogl-pango.so and libcogl.so
        </seg>
-
         <seg>
-         /usr/include/cogl/{cogl,cogl-pango},
-         /usr/share/cogl/examples-data and 
+         /usr/include/cogl,
+         /usr/share/cogl and 
          /usr/share/gtk-doc/html/{cogl,cogl-2.0-experimental}
        </seg>
       </seglistitem>

Modified: trunk/BOOK/x/lib/gtk+3.xml
===================================================================
--- trunk/BOOK/x/lib/gtk+3.xml  2012-04-16 16:14:42 UTC (rev 9922)
+++ trunk/BOOK/x/lib/gtk+3.xml  2012-04-16 17:06:53 UTC (rev 9923)
@@ -14,7 +14,7 @@
   <!ENTITY gtk3-time          "2.9 SBU">
 ]>
 
-<sect1 id="gtk3" xreflabel="gtk+-&gtk3-version;">
+<sect1 id="gtk3" xreflabel="GTK+-&gtk3-version;">
   <?dbhtml filename="gtk3.html"?>
 
   <sect1info>
@@ -22,18 +22,18 @@
     <date>$Date$</date>
   </sect1info>
 
-  <title>gtk+-&gtk3-version;</title>
+  <title>GTK+-&gtk3-version;</title>
 
   <indexterm zone="gtk3">
     <primary sortas="a-gtk3">gtk+-3</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to gtk+-3</title>
+    <title>Introduction to GTK+-3</title>
 
     <para>
-      The <application>Gtk+-3</application> package contains
-      <application>Gtk+-3</application> libraries. These are used for creating
+      The <application>GTK+-3</application> package contains
+      <application>GTK+-3</application> libraries. These are used for creating
       graphical user interfaces for applications.
     </para>
 
@@ -73,33 +73,29 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">gtk+-3 Dependencies</bridgehead>
+    <bridgehead renderas="sect3">GTK+-3 Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="cairo"/> (compiled with support for glib and libX11),
       <xref linkend="atk"/>,
-      <xref linkend="pango"/>,
       <xref linkend="gdk-pixbuf"/> and
-      <xref linkend="x-window-system"/> (specifically,
-      <application>libX11</application>, <application>libXext</application>,
-      <application>libXi</application> and 
<application>libXrender</application>
-      are required, <application>libXinerama</application>,
-      <application>libXcomposite</application>,
-      <application>libXrandr</application> and
-      <application>libXdamage</application> are optional)
+      <xref linkend="pango"/>
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/> (required if you want to build
+      GNOME. NB, you will need to install
+      <application>Gobject Introspection</application> before you install
+      <xref linkend="atk"/>, <xref linkend="gdk-pixbuf"/> and
+      <xref linkend="pango"/>.)
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="cups"/>,
       <xref linkend="docbook-utils"/>,
-      <xref linkend="colord"/>,
-      <xref linkend="gobject-introspection"/> (required if you want to build
-      <xref linkend="gnome"/>. NB, you will need to install
-      <application>Gobject Introspection</application> before you install
-      <xref linkend="atk"/>, <xref linkend="pango"/> and
-      <xref linkend="gdk-pixbuf"/>.) and
+      <xref linkend="colord"/> and
       <xref linkend="gtk-doc"/> (only needed if you want to rebuild the
       documentation).
     </para>
@@ -110,10 +106,10 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of gtk+-3</title>
+    <title>Installation of GTK+-3</title>
 
     <para>
-      Install <application>Gtk+-3</application> by running the following
+      Install <application>GTK+-3</application> by running the following
       commands:
     </para>
 
@@ -151,7 +147,7 @@
   </sect2>
 
   <sect2 role="configuration">
-    <title>Configuring gtk+-3</title>
+    <title>Configuring GTK+-3</title>
 
     <sect3 id="gtk3-config">
       <title>Config Files</title>
@@ -172,9 +168,9 @@
     <sect3><title>Configuration Information</title>
 
       <para>
-        Gtk+-3 themes change the way a gtk application looks. An icon theme can
+        GTK+-3 themes change the way a gtk application looks. An icon theme can
         be used to change the icons that appear on the application's toolbar. 
If
-        you have installed a Gtk+-3 theme (eg
+        you have installed a GTK+-3 theme (eg
         <xref linkend="gnome-themes-standard"/> or an icon theme (such as
         <xref linkend="gnome-icon-theme"/>) you can set your prefences in
         <filename>~/.config/gtk-3.0/settings.ini</filename>:
@@ -213,12 +209,17 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gtk3-demo, gtk-query-immodules-3.0, and 
gtk-update-icon-cache</seg>
-        <seg>libgailutil.so, libgdk-3.so, and libgtk-3.so</seg>
         <seg>
-          /etc/gtk-3.0, /usr/include/gtk-3.0, /usr/include/gail-3.0,
-          /usr/lib/gtk-3.0 and /usr/share/gtk-3.0
+          gtk3-demo, gtk-query-immodules-3.0 and gtk-update-icon-cache
         </seg>
+        <seg>
+          libgailutil.so, libgdk-3.so and libgtk-3.so
+        </seg>
+        <seg>
+          /etc/gtk-3.0, /usr/include/{gail-3.0,gtk-3.0},
+          /usr/lib/gtk-3.0, /usr/share/gtk-3.0 and
+          /usr/share/gtk-doc/html/{gail-libgail-util3,gdk3,gtk3}
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -232,7 +233,7 @@
         <listitem>
           <para>
             is a simple program that demonstrates some of the things that can 
be
-            done with <application>Gtk+-3</application>
+            done with <application>GTK+-3</application>
           </para>
           <indexterm zone="gtk3 gtk3-demo">
             <primary sortas="b-gtk3-demo">gtk3-demo</primary>
@@ -245,7 +246,7 @@
         <listitem>
           <para>
             collects information about loadable input method modules for
-            <application>Gtk+-3</application> and writes it to the default 
cache
+            <application>GTK+-3</application> and writes it to the default 
cache
             file location, or to standard output.
           </para>
           <indexterm zone="gtk3 gtk-query-immodules-3.0">
@@ -286,7 +287,7 @@
           <para>
             contains functions that act as a wrapper around the low-level
             drawing and windowing functions provided by the underlying graphics
-            system (libX11 for now, but maybe in the future Wayland).
+            system.
           </para>
           <indexterm zone="gtk3 libgdk-3">
             <primary sortas="c-libgdk-3">libgdk-3.so</primary>

Deleted: trunk/BOOK/x/lib/gtkmm.xml
===================================================================
--- trunk/BOOK/x/lib/gtkmm.xml  2012-04-16 16:14:42 UTC (rev 9922)
+++ trunk/BOOK/x/lib/gtkmm.xml  2012-04-16 17:06:53 UTC (rev 9923)
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gtkmm-download-http
-    "&gnome-download-http;/gtkmm/3.4/gtkmm-&gtkmm-version;.tar.xz">
-  <!ENTITY gtkmm-download-ftp
-     "&gnome-download-ftp;/gtkmm/3.4/gtkmm-&gtkmm-version;.tar.xz">
-  <!ENTITY gtkmm-md5sum        "cae0fa7143ad8d9df678859bf8bdc1cb">
-  <!ENTITY gtkmm-size          "8.8 MB">
-  <!ENTITY gtkmm-buildsize     "240 MB">
-  <!ENTITY gtkmm-time          "3.0 SBU">
-]>
-
-<sect1 id="gtkmm" xreflabel="gtkmm-&gtkmm-version;">
-  <?dbhtml filename="gtkmm.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gtkmm-&gtkmm-version;</title>
-
-  <indexterm zone="gtkmm">
-    <primary sortas="a-gtkmm">gtkmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gtkmm</title>
-
-    <para>
-      The <application>gtkmm</application> package provides a C++ interface to
-      <application>GTK+-3</application>.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtkmm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtkmm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtkmm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtkmm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtkmm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtkmm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gtkmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="atkmm"/>,
-      <xref linkend="gtk3"/> and
-      <xref linkend="pangomm"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gtkmm"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gtkmm</title>
-
-    <para>
-      Install <application>gtkmm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libgdkmm-3.0.so and libgtkmm-3.0.so.
-        </seg>
-        <seg>
-          /usr/include/{gdkmm-3.0,gtkmm-3.0},
-          /usr/lib/{gdkmm-3.0,gtkmm-3.0},
-          /usr/share/devhelp/books/gtkmm-3.0 and
-          /usr/share/doc/gtkmm-3.0.
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgdkmm-3.0">
-        <term><filename class='libraryfile'>libgdkmm-3.0.so</filename></term>
-        <listitem>
-          <para>
-        contains the GDK API classes.
-        </para>
-          <indexterm zone="gtkmm libgdkmm-3.0">
-            <primary sortas="c-libgdkmm-3.0">libgdkmm-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtkmm-3.0">
-        <term><filename class='libraryfile'>libgtkmm-3.0.so</filename></term>
-        <listitem>
-          <para>
-        contains the <application>GTK+</application> API classes.
-        </para>
-          <indexterm zone="gtkmm libgtkmm-3.0">
-            <primary sortas="c-libgtkmm-3.0">libgtkmm-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>

Modified: trunk/BOOK/x/lib/gtkmm2.xml
===================================================================
--- trunk/BOOK/x/lib/gtkmm2.xml 2012-04-16 16:14:42 UTC (rev 9922)
+++ trunk/BOOK/x/lib/gtkmm2.xml 2012-04-16 17:06:53 UTC (rev 9923)
@@ -14,7 +14,7 @@
   <!ENTITY gtkmm2-time          "2.8 SBU">
 ]>
 
-<sect1 id="gtkmm2" xreflabel="Gtkmm-&gtkmm-version;">
+<sect1 id="gtkmm2" xreflabel="Gtkmm-&gtkmm2-version;">
   <?dbhtml filename="gtkmm2.html"?>
 
   <sect1info>
@@ -34,7 +34,7 @@
     <para>
       The <application>Gtkmm</application> package provides a C++ interface to
       <application>GTK+-2</application>. It can be installed alongside
-      <xref linkend="gtkmm"/> (the <application>GTK+-3</application> version)
+      <xref linkend="gtkmm3"/> (the <application>GTK+-3</application> version)
       with no namespace conflicts.
     </para>
 

Copied: trunk/BOOK/x/lib/gtkmm3.xml (from rev 9922, trunk/BOOK/x/lib/gtkmm.xml)
===================================================================
--- trunk/BOOK/x/lib/gtkmm3.xml                         (rev 0)
+++ trunk/BOOK/x/lib/gtkmm3.xml 2012-04-16 17:06:53 UTC (rev 9923)
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gtkmm3-download-http
+    "&gnome-download-http;/gtkmm/3.4/gtkmm-&gtkmm3-version;.tar.xz">
+  <!ENTITY gtkmm3-download-ftp
+     "&gnome-download-ftp;/gtkmm/3.4/gtkmm-&gtkmm3-version;.tar.xz">
+  <!ENTITY gtkmm3-md5sum        "cae0fa7143ad8d9df678859bf8bdc1cb">
+  <!ENTITY gtkmm3-size          "8.8 MB">
+  <!ENTITY gtkmm3-buildsize     "240 MB">
+  <!ENTITY gtkmm3-time          "3.0 SBU">
+]>
+
+<sect1 id="gtkmm3" xreflabel="Gtkmm-&gtkmm3-version;">
+  <?dbhtml filename="gtkmm3.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Gtkmm-&gtkmm3-version;</title>
+
+  <indexterm zone="gtkmm3">
+    <primary sortas="a-gtkmm3">gtkmm3</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Gtkmm</title>
+
+    <para>
+      The <application>Gtkmm</application> package provides a C++ interface to
+      <application>GTK+-3</application>.
+    </para>
+
+    &lfs70_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gtkmm3-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gtkmm3-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gtkmm3-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gtkmm3-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gtkmm3-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gtkmm3-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Gtkmm Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="atkmm"/>,
+      <xref linkend="gtk3"/> and
+      <xref linkend="pangomm"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/gtkmm3"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Gtkmm</title>
+
+    <para>
+      Install <application>Gtkmm</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          libgdkmm-3.0.so and libgtkmm-3.0.so.
+        </seg>
+        <seg>
+          /usr/include/{gdkmm-3.0,gtkmm-3.0},
+          /usr/lib/{gdkmm-3.0,gtkmm-3.0},
+          /usr/share/devhelp/books/gtkmm-3.0 and
+          /usr/share/doc/gtkmm-3.0.
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgdkmm-3.0">
+        <term><filename class='libraryfile'>libgdkmm-3.0.so</filename></term>
+        <listitem>
+          <para>
+        contains the GDK API classes.
+        </para>
+          <indexterm zone="gtkmm3 libgdkmm-3.0">
+            <primary sortas="c-libgdkmm-3.0">libgdkmm-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgtkmm-3.0">
+        <term><filename class='libraryfile'>libgtkmm-3.0.so</filename></term>
+        <listitem>
+          <para>
+        contains the <application>GTK+3</application> API classes.
+        </para>
+          <indexterm zone="gtkmm3 libgtkmm-3.0">
+            <primary sortas="c-libgtkmm-3.0">libgtkmm-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>

Modified: trunk/BOOK/x/lib/lib.xml
===================================================================
--- trunk/BOOK/x/lib/lib.xml    2012-04-16 16:14:42 UTC (rev 9922)
+++ trunk/BOOK/x/lib/lib.xml    2012-04-16 17:06:53 UTC (rev 9923)
@@ -36,8 +36,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gtk+2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gtk+3.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="gtk-engines.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gtkmm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gtkmm2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gtkmm3.xml"/>
   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="lesstif.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="startup-notification.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libwnck.xml"/>

Modified: trunk/BOOK/x/lib/pangomm.xml
===================================================================
--- trunk/BOOK/x/lib/pangomm.xml        2012-04-16 16:14:42 UTC (rev 9922)
+++ trunk/BOOK/x/lib/pangomm.xml        2012-04-16 17:06:53 UTC (rev 9923)
@@ -91,15 +91,11 @@
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          None
-        </seg>
-        <seg>
           libpangomm-1.4.so
         </seg>
         <seg>

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to