From 67f6cfd960a1d2354d49b335898239637c7e12fe Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Wed, 25 Jan 2012 03:51:47 +0000
Subject: [PATCH] Update to libgnomeui-2.24.5.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9208 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 gnome/deprecated/libgnomeui.xml    | 27 +++++++++++++++++----------
 introduction/welcome/changelog.xml |  6 +++---
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/general.ent b/general.ent
index c7c74c9e68..3d5b760adb 100644
--- a/general.ent
+++ b/general.ent
@@ -742,7 +742,7 @@ $Date$
 <!ENTITY libgnome-version             "2.32.1">
 <!ENTITY libgnomecanvas-version       "2.30.3">
 <!ENTITY libbonoboui-version          "2.24.5">
-<!ENTITY libgnomeui-version           "2.24.3">
+<!ENTITY libgnomeui-version           "2.24.5">
 
 <!-- Obsolete
 <!ENTITY gal-version                  "2.4.3">
diff --git a/gnome/deprecated/libgnomeui.xml b/gnome/deprecated/libgnomeui.xml
index 1d3fe968c5..331db33fe2 100644
--- a/gnome/deprecated/libgnomeui.xml
+++ b/gnome/deprecated/libgnomeui.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY libgnomeui-download-http "&gnome-download-http;/libgnomeui/2.24/libgnomeui-&libgnomeui-version;.tar.bz2">
   <!ENTITY libgnomeui-download-ftp  "&gnome-download-ftp;/libgnomeui/2.24/libgnomeui-&libgnomeui-version;.tar.bz2">
-  <!ENTITY libgnomeui-md5sum        "ceab6f4370581d1a03c09f15cc103099">
-  <!ENTITY libgnomeui-size          "1.3 MB">
-  <!ENTITY libgnomeui-buildsize     "41 MB">
+  <!ENTITY libgnomeui-md5sum        "d4bb506b1916015323928faab5aa708b">
+  <!ENTITY libgnomeui-size          "1.4 MB">
+  <!ENTITY libgnomeui-buildsize     "53 MB">
   <!ENTITY libgnomeui-time          "0.7 SBU">
 ]>
 
@@ -35,7 +35,7 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome2.xml"/>
 
-    &lfs65_checked;
+    &lfs70_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -67,8 +67,8 @@
     <xref linkend="xorg7-lib"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libjpeg"/>,
-    <xref linkend="esound"/>, and
+    <para role="optional"><!-- <xref linkend="libjpeg"/>,
+    <xref linkend="esound"/>, and -->
     <xref linkend="gtk-doc"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -87,7 +87,8 @@
                 --variable=prefix ORBit-2.0)/lib/libgnomeui &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>This package's testsuite is only intended to be used by the
+    maintainer to check i18n files.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
@@ -107,15 +108,21 @@ make</userinput></screen>
     <filename class="directory">$GNOME_PREFIX/lib/libgnomeui</filename> instead
     of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
-    <para><option>--with-kde-datadir=$KDE_PREFIX/share</option>: Use this
+    <para><option>--disable-static</option>: This switch prevents the static
+    libraries being installed.</para>
+
+    <!-- seems bogus, no kde dependencies. dashes changed to plus to keep it
+    as a valid comment
+   <para><option>++with-kde-datadir=$KDE_PREFIX/share</option>: Use this
     parameter if you have <application>KDE</application> installed in any prefix
-    other than <filename class='directory'>/usr</filename>.</para>
+    other than <filename class='directory'>/usr</filename>.</para>-->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
 
+  <!-- not relevant to anything using the deprecated packages
   <sect2 role="configuration">
     <title>Configuring libgnomeui</title>
 
@@ -135,7 +142,7 @@ make</userinput></screen>
 
     </sect3>
 
-  </sect2>
+  </sect2> -->
 
   <sect2 role="content">
     <title>Contents</title>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 7c25c75f24..2fc29d2a76 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -52,9 +52,9 @@
         </listitem>
         <listitem>
           <para>[ken] - Update to libbonobo-2.32.1, libgnome-2.32.1,
-          gnome-media-2.32.0, libgnomecanvas-2.30.3, libbonoboui-2.24.5,
-          Merge libcanberra-0.28, GConf-3.2.3 and librsvg-2.34.2 from
-          Wayne.</para>
+          gnome-media-2.32.0, libgnomecanvas-2.30.3, libbonoboui-2.24.5
+          and libgnomeui-2.24.5. Merge libcanberra-0.28, GConf-3.2.3 and
+          librsvg-2.34.2 from Wayne.</para>
         </listitem>
       </itemizedlist>
     </listitem>