[blfs-book] r9303 - in trunk/BOOK: . introduction/welcome xsoft/office

ken at linuxfromscratch.org ken at linuxfromscratch.org
Tue Feb 7 13:37:48 PST 2012


Author: ken
Date: 2012-02-07 14:37:43 -0700 (Tue, 07 Feb 2012)
New Revision: 9303

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/xsoft/office/evolution.xml
Log:
update to evolution-3.2.2.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-02-07 19:26:03 UTC (rev 9302)
+++ trunk/BOOK/general.ent	2012-02-07 21:37:43 UTC (rev 9303)
@@ -818,7 +818,7 @@
 <!ENTITY gnumeric-version             "1.10.17">
 <!ENTITY gnucash-version              "2.2.4">
 <!ENTITY gimp-version                 "2.6.12">
-<!ENTITY evolution-version            "2.30.2">
+<!ENTITY evolution-version            "3.2.2">
 <!ENTITY icedtea-web-version          "1.0.1">
 
 <!-- Chapter 36 -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2012-02-07 19:26:03 UTC (rev 9302)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2012-02-07 21:37:43 UTC (rev 9303)
@@ -62,6 +62,9 @@
         <listitem>
           <para>[ken] - add NetworkManager-0.9.2.0 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merge evolution-3.2.2 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/xsoft/office/evolution.xml
===================================================================
--- trunk/BOOK/xsoft/office/evolution.xml	2012-02-07 19:26:03 UTC (rev 9302)
+++ trunk/BOOK/xsoft/office/evolution.xml	2012-02-07 21:37:43 UTC (rev 9303)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-version;/evolution-&evolution-version;.tar.bz2">
-  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-version;/evolution-&evolution-version;.tar.bz2">
-  <!ENTITY evolution-md5sum        "ff2f1843d9f61e151a6bccf89eeff088">
-  <!ENTITY evolution-size          "31.1 MB">
-  <!ENTITY evolution-buildsize     "402 MB">
-  <!ENTITY evolution-time          "12 SBU">
+  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-version;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-version;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-md5sum        "1c661fb7a982ba6b3624becaa3079eb8">
+  <!ENTITY evolution-size          "11 MB">
+  <!ENTITY evolution-buildsize     "420 MB">
+  <!ENTITY evolution-time          "18.6 SBU">
 ]>
 
 <sect1 id="evolution" xreflabel="Evolution-&evolution-version;">
@@ -31,9 +31,9 @@
 
     <para>The <application>Evolution</application> package contains an
     integrated mail, calendar and address book suite designed for the
-    <application>GNOME-2</application> environment.</para>
+    <application>GNOME</application> environment.</para>
 
-    &lfs65_built;
+    &lfs70_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -64,7 +64,7 @@
     <xref linkend="gnome-desktop"/>,
     <xref linkend="gtkhtml"/>,
     <xref linkend="libcanberra"/>,
-    <xref linkend="libgnomecanvas"/>,
+    <!--<xref linkend="libgnomecanvas"/>,-->
     <xref linkend="libunique"/>, and
     <xref linkend="shared-mime-info"/></para>
 
@@ -138,15 +138,12 @@
             --with-nss-includes=/usr/include/nss</parameter></literallayout>
     </note>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib \
+<screen><userinput>./configure --prefix=$GNOME_PREFIX \
+            --sysconfdir=$GNOME_SYSCONFDIR \
+            --libexecdir=$GNOME_PREFIX/lib \
             --enable-nntp \
             --enable-nss \
             --enable-smime \
-            --disable-nm \
             --disable-image-inline \
             --disable-pst-import &&
 make</userinput></screen>
@@ -178,9 +175,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib</parameter>: This parameter causes the libexec
-    files to be installed in the preferred location of
+    <para><parameter>--libexecdir=$GNOME_PREFIX/lib</parameter>: This parameter
+    causes the libexec files to be installed in the preferred location of
     <filename class="directory">$GNOME_PREFIX/lib/evolution</filename> instead
     of <filename
     class="directory">$GNOME_PREFIX/libexec/evolution</filename>.</para>
@@ -195,16 +191,17 @@
     in the Mozilla Network Security Services libraries for S/MIME
     support.</para>
 
-    <para><parameter>--disable-nm</parameter>: This parameter is used to disable
-    <application>NetworkManager</application> support. Remove it if you have
-    <application>NetworkManager</application> installed.</para>
-
     <para><parameter>--disable-image-inline</parameter>: This parameter is used
     to disable the image-inline plugin.</para>
- 
+
     <para><parameter>--disable-pst-import</parameter>: This parameter is used to
     disable the pst-import plugin.</para>
 
+    <!-- changed to optional since gnome-3.2 requires NM in my experience : ken -->
+    <para><option>--disable-nm</option>: This parameter is used to disable
+    <application>NetworkManager</application> support. Use it if you have not
+    installed <application>NetworkManager</application>.</para>
+
     <!--
     <para><parameter>-with-{nspr,nss}-includes</parameter>: This parameter is
     used to identify where the Mozilla Network Security Services interface




More information about the blfs-book mailing list