From 4b5d7cbe09652ad25cf960b3e4031ee22fe7fc17 Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Fri, 27 Apr 2012 21:15:59 +0000
Subject: [PATCH] eog 3.4.1 and vino 3.4.1

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10011 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 +-
 gnome/core/eog.xml                 | 59 ++++++++++++----------
 gnome/core/vino.xml                | 79 +++++++++++++++++-------------
 introduction/welcome/changelog.xml |  6 +++
 4 files changed, 85 insertions(+), 63 deletions(-)

diff --git a/general.ent b/general.ent
index 6f3ee91da7..317e66eca5 100644
--- a/general.ent
+++ b/general.ent
@@ -756,13 +756,13 @@ $Date$
 <!ENTITY gnome-backgrounds-version    "3.4.1">
 <!ENTITY gnome-user-share-version     "3.0.1">
 <!ENTITY gnome-user-docs-version      "3.4.1">
-<!ENTITY vino-version                 "3.2.2">
+<!ENTITY vino-version                 "3.4.1">
 
 <!-- Utilities -->
 <!ENTITY baobab-version               "3.4.1">
 <!ENTITY brasero-version              "3.4.1">
 <!ENTITY empathy-version              "3.4.1">
-<!ENTITY eog-version                  "3.2.2">
+<!ENTITY eog-version                  "3.4.1">
 <!ENTITY epiphany-version             "3.4.1">
 <!ENTITY evince-version               "3.4.0">
 <!ENTITY gcalctool-version            "6.2.0">
diff --git a/gnome/core/eog.xml b/gnome/core/eog.xml
index 49097df574..8c8b22f6b3 100644
--- a/gnome/core/eog.xml
+++ b/gnome/core/eog.xml
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-version;/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-version;/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-md5sum        "66d2c1d8d250a37e18f3fbf696642214">
-  <!ENTITY eog-size          "3.1 MB">
-  <!ENTITY eog-buildsize     "51 MB">
+  <!ENTITY eog-download-http "&gnome-download-http;/eog/3.4/eog-&eog-version;.tar.xz">
+  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/3.4/eog-&eog-version;.tar.xz">
+  <!ENTITY eog-md5sum        "4d082c6df54a8494c56c72bce6646659">
+  <!ENTITY eog-size          "3.2 MB">
+  <!ENTITY eog-buildsize     "55 MB">
   <!ENTITY eog-time          "1.2 SBU">
 ]>
 
@@ -60,21 +60,28 @@
     <bridgehead renderas="sect3">EOG Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-desktop"/>,
-    <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gnome-icon-theme"/>,
-    <xref linkend="libpeas"/>, and
-    <xref linkend="shared-mime-info"/></para>
+    <para role="required">
+      <xref linkend="gnome-desktop"/>,
+      <xref linkend="gnome-doc-utils"/>,
+      <xref linkend="gnome-icon-theme"/>,
+      <xref linkend="libpeas"/> and
+      <xref linkend="shared-mime-info"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/> and
-    <xref linkend="rarian"/></para>
+    <para role="recommended">
+      <xref linkend="rarian"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="exempi"/>,
-    <xref linkend="lcms2"/>,
-    <xref linkend="libexif"/>, and
-    <xref linkend="librsvg"/></para>
+    <para role="optional">
+      <xref linkend="exempi"/>,
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="lcms2"/>,
+      <xref linkend="libexif"/> and
+      <xref linkend="librsvg"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/eog"/></para>
@@ -87,7 +94,7 @@
     <para>Install <application>EOG</application> by running the
     following commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -101,15 +108,12 @@ make</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/> -->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
-    <para><option>--without-libjpeg</option>: This option disables special JPEG
-    support.</para>
-
   </sect2>
 
   <sect2 role="content">
@@ -117,13 +121,16 @@ make</userinput></screen>
 
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>eog</seg>
-        <seg>libfullscreen.so, libreload.so and libstatusbar-date.so (plugins)</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/eog-3.0, lib/eog, share/eog}</seg>
+        <seg>
+          eog
+        </seg>
+        <seg>
+          /usr/include/eog-3.0, /usr/lib/eog, /usr/share/eog,
+          /usr/share/gnome/help/eog and /usr/share/gtk-doc/html/eog
+        </seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/gnome/core/vino.xml b/gnome/core/vino.xml
index 7fc88b3244..615f0f1c52 100644
--- a/gnome/core/vino.xml
+++ b/gnome/core/vino.xml
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY vino-download-http "&gnome-download-http;/vino/&gnome-version;/vino-&vino-version;.tar.xz">
-  <!ENTITY vino-download-ftp  "&gnome-download-ftp;/vino/&gnome-version;/vino-&vino-version;.tar.xz">
-  <!ENTITY vino-md5sum        "ed9e47261f352b04738e644ecc5301fb">
-  <!ENTITY vino-size          "727 KB">
-  <!ENTITY vino-buildsize     "19 MB">
+  <!ENTITY vino-download-http "&gnome-download-http;/vino/3.4/vino-&vino-version;.tar.xz">
+  <!ENTITY vino-download-ftp  "&gnome-download-ftp;/vino/3.4/vino-&vino-version;.tar.xz">
+  <!ENTITY vino-md5sum        "47b455597312b0d59627dd3ae48c4d20">
+  <!ENTITY vino-size          "730 KB">
+  <!ENTITY vino-buildsize     "18 MB">
   <!ENTITY vino-time          "0.3 SBU">
 ]>
 
@@ -33,7 +33,7 @@
     <application>GNOME</application>. VNC is a protocol that allows remote
     display of a user's desktop.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -60,20 +60,26 @@
     <bridgehead renderas="sect3">Vino Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GConf"/>,
-    <xref linkend="gtk3"/>,
-    <xref linkend="libgnome-keyring"/>, and
-    <xref linkend="libsoup"/></para>
+    <para role="required">
+      <xref linkend="gtk3"/>,
+      <xref linkend="intltool"/>,
+      <xref linkend="libgnome-keyring"/> and
+      <xref linkend="libsoup"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libnotify"/>,
+      <xref linkend="NetworkManager"/> and
+      <xref linkend="telepathy-glib"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="avahi"/>,
-    <xref linkend="glibmm"/>,
-    <xref linkend="gnutls"/>,
-    <xref linkend="libnotify"/>,
-    <xref linkend="libsexy"/>,
-    <xref linkend="libunique"/>,
-    <xref linkend="NetworkManager"/>,
-    and <xref linkend="telepathy-glib"/></para>
+    <para role="optional">
+      <xref linkend="avahi"/>,
+      <xref linkend="gnutls"/> and
+      <xref linkend="libgcrypt"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/vino"/></para>
@@ -86,9 +92,9 @@
     <para>Install <application>Vino</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --sysconfdir=$GNOME_SYSCONFDIR \
-            --libexecdir=$GNOME_PREFIX/lib/vino &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib/vino &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -102,17 +108,17 @@ make</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/> -->
 
-    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/vino</parameter>: This
+    <para><parameter>--libexecdir=/usr/lib/vino</parameter>: This
     parameter is used so that the <application>vino</application> internal
     support programs are installed in the preferred location of <filename
-    class='directory'>$GNOME_PREFIX/lib/vino</filename> instead of <filename
-    class='directory'>$GNOME_PREFIX/libexec</filename>.</para>
+    class='directory'>/usr/lib/vino</filename> instead of <filename
+    class='directory'>/usr/libexec</filename>.</para>
 
   </sect2>
 
@@ -121,13 +127,15 @@ make</userinput></screen>
 
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>vino-passwd, vino-preferences, and vino-server</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{lib/vino,share/vino}</seg>
+        <seg>
+          vino-passwd, vino-preferences and vino-server
+        </seg>
+        <seg>
+          /usr/lib/vino and /usr/share/vino
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -136,10 +144,10 @@ make</userinput></screen>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <!--<varlistentry id="vino-passwd">
+      <varlistentry id="vino-passwd">
         <term><command>vino-passwd</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>is used to update Vino password.</para>
           <indexterm zone="vino vino-passwd">
             <primary sortas="b-vino-passwd">vino-passwd</primary>
           </indexterm>
@@ -149,17 +157,18 @@ make</userinput></screen>
       <varlistentry id="vino-preferences">
         <term><command>vino-preferences</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>is a GUI tool used to configure the machine for
+          VNC Access.</para>
           <indexterm zone="vino vino-preferences">
             <primary sortas="b-vino-preferences">vino-preferences</primary>
           </indexterm>
         </listitem>
-      </varlistentry>-->
+      </varlistentry>
 
       <varlistentry id="vino-server">
         <term><command>vino-server</command></term>
         <listitem>
-          <para>is the <application>Vino</application> server.</para>
+          <para>is the <application>Vino</application> VNC server.</para>
           <indexterm zone="vino vino-server">
             <primary sortas="b-vino-server">vino-server</primary>
           </indexterm>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 7b794ad550..8a13f9af87 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -70,6 +70,12 @@
         <listitem> 
           <para>[krejzi] - Epiphany 3.4.1.</para>
         </listitem>
+        <listitem>
+          <para>[krejzi] - EOG 3.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Vino 3.4.1.</para>
+        </listitem>
       </itemizedlist>
     </listitem>