Changeset 05a757b

Timestamp:

02/10/2012 07:59:56 PM (12 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

67106a3d

Parents:

98f9ae3

Message:

Empathy-3.2.2.

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

Files:

• general.ent (modified) (2 diffs)
• gnome/add/add.xml (modified) (1 diff)
• gnome/core/core.xml (modified) (1 diff)
• gnome/core/empathy.xml (moved) (moved from gnome/add/empathy.xml ) (5 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -706 +706 @@
 <!-- Utilities -->
 <!ENTITY brasero-version              "3.2.0">
+<!ENTITY empathy-version              "3.2.2">
 <!ENTITY gnome-terminal-version       "2.30.2">
 <!ENTITY nautilus-version             "2.30.1">
@@ -741 +742 @@
 <!ENTITY deskbar-applet-version       "2.30.1">
 <!ENTITY ekiga-version                "3.2.7">
-<!ENTITY empathy-version              "2.30.2">
 <!ENTITY eog-version                  "2.30.2">
 <!ENTITY epiphany-version             "2.30.2">

gnome/add/add.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="deskbar-applet.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ekiga.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="empathy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>

gnome/core/core.xml

@@ -95 +95 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="brasero.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="empathy.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="empathy.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evince.xml"/>

gnome/core/empathy.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY empathy-download-http "&gnome-download-http;/empathy/&gnome-version;/empathy-&empathy-version;.tar.bz2">
-  <!ENTITY empathy-download-ftp  "&gnome-download-ftp;/empathy/&gnome-version;/empathy-&empathy-version;.tar.bz2">
-  <!ENTITY empathy-md5sum        "964b48ccc63a2acdd14224eb763d6bf6">
-  <!ENTITY empathy-size          "2.5 MB">
-  <!ENTITY empathy-buildsize     "97 MB">
-  <!ENTITY empathy-time          "1.5 SBU">
+  <!ENTITY empathy-download-http "&gnome-download-http;/empathy/&gnome-version;/empathy-&empathy-version;.tar.xz">
+  <!ENTITY empathy-download-ftp  "&gnome-download-ftp;/empathy/&gnome-version;/empathy-&empathy-version;.tar.xz">
+  <!ENTITY empathy-md5sum        "1e55c9052cbee9cb065e23cb358a6720">
+  <!ENTITY empathy-size          "?? MB">
+  <!ENTITY empathy-buildsize     "?? MB">
+  <!ENTITY empathy-time          "?? SBU">
 ]>
 
@@ -34 +34 @@
     different protocols.</para>
 
-    &lfs65_built;
+    <!-- &lfs65_built; not for this version! -->
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -80 +80 @@
     <xref linkend="iso-codes"/>,
     <ulink url="http://projects.gnome.org/libchamplain/">libchamplain</ulink>,
-    <ulink url="http://www.gnome.org/projects/NetworkManager/">NetworkManager</ulink>,
+    <xref linkend="NetworkManager"/>,
     <xref linkend="pygtk"/>,
     <xref linkend="rarian"/>,
@@ -112 +112 @@
     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/empathy &amp;&amp;
+<screen><userinput>./configure --prefix=$GNOME_PREFIX \
+            --sysconfdir=$GNOME_SYSCONFDIR \
+            --libexecdir=$GNOME_PREFIX/lib/empathy &amp;&amp;
 make</userinput></screen>
 
@@ -135 +134 @@
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/empathy</parameter>: This parameter is used so that the
-    <application>Empathy</application> internal support programs are installed
-    in the preferred location of <filename
+    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/empathy</parameter>: This
+    parameter is used so that the <application>Empathy</application> internal
+    support programs are installed in the preferred location of <filename
     class='directory'>$GNOME_PREFIX/lib/empathy</filename> instead of <filename
     class='directory'>$GNOME_PREFIX/libexec</filename>.</para>

introduction/welcome/changelog.xml

@@ -70 +70 @@
           <para>[ken] - add dconf-0.10.0 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merge empathy-3.2.2 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>