vinagre-3.2.2

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9550 af4574ff-66df-0310-9fd7-8a98e5e911e0

general.ent

@@ -802,7 +802,7 @@ program you invoke.  Development restarted Feb 12, so commented until a new rele
 <!ENTITY rygel-version                "0.12.5">
 <!ENTITY seahorse-version             "3.2.2">
 <!ENTITY totem-version                "3.2.1">
-<!ENTITY vinagre-version              "2.30.2">
+<!ENTITY vinagre-version              "3.2.2">
 
 <!-- Accessibility -->
 <!ENTITY orca-version                 "3.2.2">

gnome/add/vinagre.xml

@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY vinagre-download-http "&gnome-download-http;/vinagre/&gnome-version;/vinagre-&vinagre-version;.tar.bz2">
-  <!ENTITY vinagre-download-ftp  "&gnome-download-ftp;/vinagre/&gnome-version;/vinagre-&vinagre-version;.tar.bz2">
-  <!ENTITY vinagre-md5sum        "2483369947e7914b5ac2aae8200f6452">
-  <!ENTITY vinagre-size          "2.3 MB">
-  <!ENTITY vinagre-buildsize     "32 MB">
-  <!ENTITY vinagre-time          "0.5 SBU">
+  <!ENTITY vinagre-download-http "&gnome-download-http;/vinagre/&gnome-version;/vinagre-&vinagre-version;.tar.xz">
+  <!ENTITY vinagre-download-ftp  "&gnome-download-ftp;/vinagre/&gnome-version;/vinagre-&vinagre-version;.tar.xz">
+  <!ENTITY vinagre-md5sum        "5becc82f021e5c97d6ef174d601ce7a8">
+  <!ENTITY vinagre-size          "2.5 MB">
+  <!ENTITY vinagre-buildsize     "26 MB">
+  <!ENTITY vinagre-time          "0.4 SBU">
 ]>
 
 <sect1 id="vinagre" xreflabel="Vinagre-&vinagre-version;">
@@ -33,7 +33,7 @@
     <application>GNOME Desktop</application>. VNC is a protocol that allows
     remote display of a user's desktop.</para>
 
-    &lfs65_checked;
+    &lfs70_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -65,10 +65,13 @@
     <xref linkend="gtk-vnc"/>, and
     <xref linkend="libgnome-keyring"/></para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="optional"><xref linkend="rarian"/></para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="avahi"/>,
-    <xref linkend="gnome-panel"/>,
-    <xref linkend="rarian"/>,
+    <!--<xref linkend="gnome-panel"/>,-->
+    <ulink url="http://www.spice-space.org/">spice-client-gtk3</ulink>,
     <xref linkend="telepathy-glib"/>, and
     <xref linkend="vte"/></para>
 
@@ -83,13 +86,7 @@
     <para>Install <application>Vinagre</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/vinagre-1 \
-            --disable-applet \
-            --disable-avahi \
-            --disable-scrollkeeper &amp;&amp;
+<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -106,30 +103,17 @@ make</userinput></screen>
     <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"/>
+    <para><option>--without-avahi</option>: This parameter prevents
+    <command>configure</command> making use of <application>avahi</application>
+    if it is present.</para>
 
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/vinagre-1</parameter>: This parameter is used so that the
-    <application>vinagre</application> internal support programs are installed
-    in the preferred location of <filename
-    class='directory'>$GNOME_PREFIX/lib/vinagre-1</filename> instead of <filename
-    class='directory'>$GNOME_PREFIX/libexec</filename>.</para>
+    <para><option>--without-telepathy</option>: This parameter prevents
+    <command>configure</command> making use of <application>telepathy-glib</application>
+    if it is present.</para>
 
-    <para><parameter>--disable-applet</parameter>: This parameter stops the
-    build of the panel applet. Remove it if you have <application>GNOME
-    Panel</application> installed.</para>
-
-    <para><parameter>--disable-avahi</parameter>: This parameter disables the
-    use of <application>avahi</application> for auto-discover machines. Remove
-    it if you have <application>avahi</application> installed.</para>
-
-    <para><parameter>--disable-scrollkeeper</parameter>: This parameter disables
-    updates to the scrollkeeper database. Remove it if you have
-    <application>rarian</application> installed.</para>
-
-    <para><option>--enable-ssh</option>: This option enables the SSH plugin.
-    Requires <application>VTE</application>.</para>
+    <!-- enabled by default
+    <para><option>\-\-enable-ssh</option>: This option enables the SSH plugin.
+    Requires <application>VTE</application>.</para>-->
 
   </sect2>
 
@@ -142,12 +126,11 @@ make</userinput></screen>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>vinagre and vinagre-applet</seg>
-        <seg>libcloader.so and libvnc.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/vinagre-1.0/vinagre,
-        lib/vinagre-1/{plugin-loaders,plugins},share/{doc/vinagre,
+        <seg>vinagre</seg>
+        <seg>librdp.so, libssh.so, and libvnc.so</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/{lib/vinagre-3.0/plugins,share/{doc/vinagre,
         gnome/help/vinagre/*,omf/vinagre,telepathy/clients,
-        vinagre-1/plugins/vnc}}</seg>
+        vinagre}}</seg>
       </seglistitem>
     </segmentedlist>
 

introduction/welcome/changelog.xml

@@ -56,6 +56,9 @@
         <listitem>
           <para>[ken] - merged totem-3.2.1 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - added vinagre-3.2.2 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>