From 4944f78d81cd78d29027b9811bb7250bbf4261a0 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Thu, 26 Jan 2012 22:17:25 +0000
Subject: [PATCH] Update to clutter-gtk-1.0.4.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9233 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 general/graphlib/clutter-gtk.xml   | 32 ++++++++++++++++--------------
 introduction/welcome/changelog.xml |  3 +++
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/general.ent b/general.ent
index 46e64ce407..c38b2251b9 100644
--- a/general.ent
+++ b/general.ent
@@ -260,7 +260,7 @@ $Date$
 <!ENTITY pixman-version               "0.24.0">
 <!ENTITY clutter-version              "1.2.10">
 <!ENTITY clutter-gst-version          "1.4.4">
-<!ENTITY clutter-gtk-version          "0.10.4">
+<!ENTITY clutter-gtk-version          "1.0.4">
 <!ENTITY babl-version                 "0.1.6">
 <!ENTITY gegl-version                 "0.1.8">
 
diff --git a/general/graphlib/clutter-gtk.xml b/general/graphlib/clutter-gtk.xml
index 4a01862825..0f8579120d 100644
--- a/general/graphlib/clutter-gtk.xml
+++ b/general/graphlib/clutter-gtk.xml
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY clutter-gtk-download-http "http://www.clutter-project.org/sources/clutter-gtk/0.10/clutter-gtk-&clutter-gtk-version;.tar.bz2">
-  <!ENTITY clutter-gtk-download-ftp  " ">
-  <!ENTITY clutter-gtk-md5sum        "fd015e8080e1212dacc95d0e3d776d0d">
-  <!ENTITY clutter-gtk-size          "300 KB">
-  <!ENTITY clutter-gtk-buildsize     "5 MB">
-  <!ENTITY clutter-gtk-time          "0.1 SBU">
+  <!ENTITY clutter-gtk-download-http "&gnome-download-http;/clutter-gtk/1.0/clutter-gtk-&clutter-gtk-version;.tar.xz">
+  <!ENTITY clutter-gtk-download-ftp "&gnome-download-ftp;/clutter-gtk/1.0/clutter-gtk-&clutter-gtk-version;.tar.xz">
+  <!ENTITY clutter-gtk-md5sum        "e85705bdd9a74ae12d4c2713e98d421b">
+  <!ENTITY clutter-gtk-size          "299 KB">
+  <!ENTITY clutter-gtk-buildsize     "5.5 MB">
+  <!ENTITY clutter-gtk-time          "0.3 SBU">
 ]>
 
 <sect1 id="clutter-gtk" xreflabel="clutter-gtk-&clutter-gtk-version;">
@@ -35,7 +35,7 @@
     <application>GTK+</application> widget, GtkClutterEmbed, for embedding the
     default ClutterStage into any GtkContainer.</para>
 
-    &lfs65_built;
+    &lfs70_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -62,7 +62,8 @@
     <bridgehead renderas="sect3">clutter-gtk Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="clutter"/></para>
+    <para role="required"><xref linkend="clutter"/> and
+    <xref linkend="gtk3"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/></para>
@@ -107,9 +108,9 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>None</seg>
-        <seg>libclutter-gtk-0.10.so</seg>
-        <seg>/usr/{include/clutter-1.0/clutter-gtk,
-        share/gtk-doc/html/clutter-gtk}</seg>
+        <seg>libclutter-gtk-1.0.so</seg>
+        <seg>/usr/{include/clutter-gtk-1.0/clutter-gtk,
+        share/gtk-doc/html/clutter-gtk-1.0}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -118,12 +119,13 @@ make</userinput></screen>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="libclutter-gtk-0.10">
-        <term><filename class='libraryfile'>libclutter-gtk-0.10.so</filename></term>
+      <varlistentry id="libclutter-gtk-1">
+        <term><filename
+        class='libraryfile'>libclutter-gtk-1.0.so</filename></term>
         <listitem>
           <para>contains the clutter-gtk API functions.</para>
-          <indexterm zone="clutter-gtk libclutter-gtk-0.10">
-            <primary sortas="c-libclutter-gtk-0.10">libclutter-gtk-0.10.so</primary>
+          <indexterm zone="clutter-gtk libclutter-gtk-1">
+            <primary sortas="c-libclutter-gtk-1">libclutter-gtk-1.0.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index bb2373a581..dd510bf302 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -49,6 +49,9 @@
           mention Cantarell fonts in the Xft Font Protocol part of xorg-config.
           </para>
         </listitem>
+        <listitem>
+	  <para>[ken] - Merge clutter-1.0.4 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>