r2735 - in trunk: BOOK BOOK/introduction/welcome BOOK/xsoft/office patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Fri Sep 10 23:14:02 PDT 2004


Author: randy
Date: 2004-09-11 00:14:00 -0600 (Sat, 11 Sep 2004)
New Revision: 2735

Added:
   trunk/patches/evolution-1.4.6-gcc34-2.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/xsoft/office/evolution.xml
Log:
Updated to Evolution-1.4.6

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-09-10 20:38:09 UTC (rev 2734)
+++ trunk/BOOK/general.ent	2004-09-11 06:14:00 UTC (rev 2735)
@@ -1,4 +1,4 @@
-<!ENTITY day          "10">
+<!ENTITY day          "11">
 <!ENTITY month        "09">
 <!ENTITY year         "2004">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -354,7 +354,7 @@
 <!ENTITY gnumeric-version             "1.2.13"> 
 <!ENTITY gnucash-version              "1.8.9"> 
 <!ENTITY gimp-version                 "2.0.4"> 
-<!ENTITY evolution-version            "1.4.5">  
+<!ENTITY evolution-version            "1.4.6">  
 
 <!-- Chapter 34 -->    
 <!ENTITY koffice-version              "1.3.2">  

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-09-10 20:38:09 UTC (rev 2734)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-09-11 06:14:00 UTC (rev 2735)
@@ -22,6 +22,9 @@
 
 <itemizedlist>
 
+<listitem><para>September 11th, 2004 [randy]: Updated to 
+Evolution-1.4.6.</para></listitem>
+
 <listitem><para>September 10th, 2004 [randy]: Corrected OpenSP instructions  
 to fix hard-coded version (replaced with version entity) as suggested by
 Nico Roeser; added optional dependencies and a note to fix a build problem

Modified: trunk/BOOK/xsoft/office/evolution.xml
===================================================================
--- trunk/BOOK/xsoft/office/evolution.xml	2004-09-10 20:38:09 UTC (rev 2734)
+++ trunk/BOOK/xsoft/office/evolution.xml	2004-09-11 06:14:00 UTC (rev 2735)
@@ -6,9 +6,13 @@
 
   <!ENTITY evolution-download-http "http://ftp.gnome.org/pub/GNOME/sources/evolution/1.4/evolution-&evolution-version;.tar.bz2">
   <!ENTITY evolution-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/evolution/1.4/evolution-&evolution-version;.tar.bz2">
-  <!ENTITY evolution-size          "12 MB">
-  <!ENTITY evolution-buildsize     "387 MB">
-  <!ENTITY evolution-time          "10.84 SBU">
+  <!ENTITY evolution-size          "14 MB">
+  <!ENTITY evolution-buildsize     "290 MB">
+  <!ENTITY evolution-time          "6.34 SBU">
+  <!ENTITY db3117-download         "http://ftp2.nchu.edu.tw/UNIX/Database/BerkeleyDB/db-3.1.17.tar.gz">
+  <!ENTITY db3117-size             "1.95 MB">
+  <!ENTITY db3117-buildsize        "28.2 MB">
+  <!ENTITY db3117-time             "0.22 SBU">
 ]>
 
 <sect1 id="evolution" xreflabel="Evolution-&evolution-version;">
@@ -39,21 +43,48 @@
 </sect3>
 
 <sect3><title>Additional downloads</title>
+<para><emphasis>Packages</emphasis></para>
 <itemizedlist spacing='compact'>
-<listitem><para>Required application: <ulink
-url="http://ftp2.nchu.edu.tw/UNIX/Database/BerkeleyDB/db-3.1.17.tar.gz"/></para></listitem>
-</itemizedlist></sect3>
+<listitem><para>Required Application: <ulink 
+url="&db3117-download;"/></para></listitem>
+<listitem><para>Download size: &db3117-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&db3117-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&db3117-time;</para></listitem></itemizedlist>
 
+<para><emphasis>Patches</emphasis></para>
+<itemizedlist spacing='compact'>
+<listitem><para>Required Patch: <ulink 
+url="&patch-root;/evolution-&evolution-version;-gcc34-2.patch"/></para>
+</listitem></itemizedlist>
+</sect3>
+
 <sect3><title><application>Evolution</application> dependencies</title>
 <sect4><title>Required</title>
-<para>
-<xref linkend="openssl"/>,
-<xref linkend="libsoup"/>,
-<xref linkend="gal"/> and
-<xref linkend="gtkhtml"/>
-</para></sect4>
+<para><xref linkend="openssl"/>, 
+<xref linkend="libsoup"/>, 
+<xref linkend="gal"/> and 
+<xref linkend="gtkhtml"/></para>
+</sect4>
+
 <sect4><title>Optional</title>
-<para><xref linkend="openldap"/> and <xref linkend="gtk-doc"/></para></sect4>
+<para><xref linkend="openldap"/>, 
+<xref linkend="sendmail"/> (or other 
+<ulink url="../server/mail.html">MTA</ulink> that links to 
+<command>/usr/sbin/sendmail</command>), 
+<xref linkend="kdebase"/>, 
+<xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 
+<ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>, 
+<xref linkend="gtk-doc"/>, 
+<xref linkend="docbook-utils"/>, 
+<ulink 
+url="http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot/2.0/">GNOME-Pilot</ulink> and 
+<ulink 
+url="http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot-conduits/2.0/">GNOME-Pilot-conduits</ulink>
+</para>
+</sect4>
+
 </sect3>
 
 </sect2>
@@ -63,11 +94,11 @@
 
 <note><para><application>Evolution</application> requires
 <application>Berkeley DB</application>-3.1.17. The details on 
-"why" are in the <filename>README</filename> file distibuted with the
-<application>Evolution</application> source code. <application>Evolution
-</application> links to the library statically, hence this book installs 
-the <application>Berkeley DB</application>-3.1.17 in <filename
-class="directory">/opt</filename>, which can be removed once 
+<quote>why</quote> are in the <filename>README</filename> file distibuted with 
+the <application>Evolution</application> source code. 
+<application>Evolution</application> links to the library statically, hence 
+this book installs the <application>Berkeley DB</application>-3.1.17 in 
+<filename class="directory">/opt</filename>, which can be removed once 
 <application>Evolution</application> is installed.</para></note>
 
 <para>Install <application>Berkeley DB</application>-3.1.17 by
@@ -81,13 +112,15 @@
 <para>Install <application>Evolution</application> by running the following 
 commands:</para>
 
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --with-db3=/opt/db-3.1.17 --enable-openssl &&
+<screen><userinput><command>patch -Np1 -i ../evolution-&evolution-version;-gcc34-2.patch &&
+./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --localstatedir=/var/lib --with-db3=/opt/db-3.1.17 \
+    --enable-openssl=yes &&
 make &&
 make install</command></userinput></screen>
 
-<para>Optionally, you may remove <application>Berkeley
-DB</application>-3.1.17 installed above with this command:</para>
+<para>Optionally, you may remove <application>Berkeley DB</application>-3.1.17 
+installed above with this command:</para>
 
 <screen><userinput><command>rm -rf /opt/db-3.1.17</command></userinput></screen>
 
@@ -100,20 +133,20 @@
 database files.</para>
 
 <para><parameter>--prefix=/opt/db-3.1.17</parameter>: This
-version of the Berkeley Database should not be installed in <filename
-class="directory">/usr</filename>, as it is only needed for the building
-of <application>Evolution</application>.</para>
+version of the Berkeley Database should not be installed in 
+<filename class="directory">/usr</filename>, as it is only needed for the 
+building of <application>Evolution</application>.</para>
 
 <para><parameter>--with-db3=/opt/db-3.1.17</parameter>: Specify
 the location where db-3.1.17 is installed.</para>
 
-<para><parameter>--enable-openssl</parameter>: This flag will compile
-<acronym>SSL</acronym> support into
-<application>Evolution</application>.</para>
+<para><parameter>--enable-openssl=yes</parameter>: This switch will compile
+<acronym>SSL</acronym> support into <application>Evolution</application>.
+</para>
 
-<para><parameter>--with-openldap</parameter>: This flag will compile
-<acronym>LDAP</acronym> support into
-<application>Evolution</application>.</para>
+<para><option>--with-openldap</option>: This flag will compile
+<acronym>LDAP</acronym> support into <application>Evolution</application>.
+</para>
 
 </sect2>
 
@@ -124,9 +157,9 @@
 <command>evolution</command>.</para>
 </sect2>
 
+<sect2>
+<title>Description</title>
 
-
-<sect2><title>Description</title>
 <sect3><title>evolution</title>
 <para><command>evolution</command> contains an email, calendar and
 address book suite.</para></sect3>

Added: trunk/patches/evolution-1.4.6-gcc34-2.patch
===================================================================
--- trunk/patches/evolution-1.4.6-gcc34-2.patch	2004-09-10 20:38:09 UTC (rev 2734)
+++ trunk/patches/evolution-1.4.6-gcc34-2.patch	2004-09-11 06:14:00 UTC (rev 2735)
@@ -0,0 +1,104 @@
+Submitted By:            Randy McMurchy (randy_at_linuxfromscratch_dot_org)
+Date:                    2004-09-10
+Initial Package Version: 1.4.6
+Upstream Status:         Not Submitted
+Origin:                  Jeremy Utley and Randy McMurchy
+Description:             Fixes syntax issues with GCC 3.4
+
+$LastChangedBy$
+$Date$
+
+diff -ur evolution-1.4.6/calendar/cal-client/cal-client.h 
+evolution-1.4.6.jbit/calendar/cal-client/cal-client.h
+--- evolution-1.4.6/calendar/cal-client/cal-client.h	2003-04-26 09:39:53.000000000 -0700
++++ evolution-1.4.6.jbit/calendar/cal-client/cal-client.h	2004-04-13 14:07:13.048767444 -0700
+@@ -213,7 +213,7 @@
+ CalClientResult cal_client_remove_object (CalClient *client, const char *uid);
+ CalClientResult cal_client_remove_object_with_mod (CalClient *client, const char *uid, CalObjModType mod);
+ 
+-CalClientSendResult cal_client_send_object (CalClient *client, icalcomponent *icalcomp, 
++CalClientResult cal_client_send_object (CalClient *client, icalcomponent *icalcomp, 
+ 					    icalcomponent **new_icalcomp, GList **users,
+ 					    char error_msg[256]);
+ 
+diff -ur evolution-1.4.6/calendar/gui/e-day-view.c evolution-1.4.6.jbit/calendar/gui/e-day-view.c
+--- evolution-1.4.6/calendar/gui/e-day-view.c	2003-08-11 20:14:21.000000000 -0700
++++ evolution-1.4.6.jbit/calendar/gui/e-day-view.c	2004-04-13 14:11:44.956505776 -0700
+@@ -3235,7 +3235,7 @@
+ 	case GDK_SCROLL_DOWN:
+ 		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
+ 		return TRUE;
+-	default:
++	default: break;
+ 	}
+ 
+ 	return FALSE;
+@@ -3255,7 +3255,7 @@
+ 	case GDK_SCROLL_DOWN:
+ 		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
+ 		return TRUE;
+-	default:
++	default: break;
+ 	}
+ 
+ 	return FALSE;
+diff -ur evolution-1.4.6/e-util/e-component-listener.c evolution-1.4.6.jbit/e-util/e-component-listener.c
+--- evolution-1.4.6/e-util/e-component-listener.c	2003-06-04 08:05:09.000000000 -0700
++++ evolution-1.4.6.jbit/e-util/e-component-listener.c	2004-04-13 13:55:04.230889468 -0700
+@@ -52,7 +52,7 @@
+ 			cl->priv->component = CORBA_OBJECT_NIL;
+ 			g_object_unref (cl);
+ 			break;
+-		default :
++		default: break;
+ 		}
+ 	}
+ }
+diff -ur evolution-1.4.6/mail/message-browser.c evolution-1.4.6.jbit/mail/message-browser.c
+--- evolution-1.4.6/mail/message-browser.c	2003-07-31 19:45:05.000000000 -0700
++++ evolution-1.4.6.jbit/mail/message-browser.c	2004-04-13 14:17:10.726599659 -0700
+@@ -344,7 +344,7 @@
+ 	case GDK_Escape:
+ 		message_browser_close (NULL, mb, NULL);
+ 		return TRUE;	
+-	default:
++	default: break;
+ 	}
+ 	
+ 	return FALSE;
+
+diff -Naur evolution-1.4.6-orig/addressbook/conduit/address-conduit.c evolution-1.4.6/addressbook/conduit/address-conduit.c
+--- evolution-1.4.6-orig/addressbook/conduit/address-conduit.c	2003-08-26 17:45:53.000000000 +0000
++++ evolution-1.4.6/addressbook/conduit/address-conduit.c	2004-09-11 02:01:04.213022248 +0000
+@@ -610,6 +610,7 @@
+ 	case E_CARD_SIMPLE_FIELD_EMAIL_2:
+ 		return E_CARD_SIMPLE_FIELD_EMAIL_3;
+ 	default:
++		break;
+ 	}
+ 
+ 	return E_CARD_SIMPLE_FIELD_LAST;
+@@ -625,6 +626,7 @@
+ 	case E_CARD_SIMPLE_FIELD_PHONE_HOME:
+ 		return E_CARD_SIMPLE_FIELD_PHONE_HOME_2;
+ 	default:
++		break;
+ 	}
+ 
+ 	return E_CARD_SIMPLE_FIELD_LAST;
+@@ -640,6 +642,7 @@
+ 	case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS:
+ 		return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2;
+ 	default:
++		break;
+ 	}
+ 
+ 	return E_CARD_SIMPLE_FIELD_LAST;
+@@ -657,6 +660,7 @@
+ 	case E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX:
+ 		return E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX;
+ 	default:
++		break;
+ 	}
+ 
+ 	return E_CARD_SIMPLE_FIELD_LAST;


Property changes on: trunk/patches/evolution-1.4.6-gcc34-2.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list