Adding more gcc3.4 fixes to address bug #53688. Added --with-pic to force -fPIC for the static-libs that are included in dynamic libs to fix amd64 compilation. Closes bug #53702.

3 files changed, 61 insertions, 14 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index e6248ee24f17..78f160ddf6dd 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/evolution
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.4 2004/06/09 15:36:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.5 2004/06/19 10:28:27 eradicator Exp $
+
+  19 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/evolution-gcc34.patch:
+  Adding more gcc3.4 fixes to address bug #53688. Added --with-pic to force
+  -fPIC for the static-libs that are included in dynamic libs to fix amd64
+  compilation. Closes bug #53702.
 
   09 Jun 2004; Aron Griffis <agriffis@gentoo.org> evolution-1.2.4.ebuild,
   evolution-1.4.5.ebuild, evolution-1.4.6.ebuild:
diff --git a/mail-client/evolution/evolution-1.4.6.ebuild b/mail-client/evolution/evolution-1.4.6.ebuild
index 26cef303fee8..c3ad465cdff3 100644
--- a/mail-client/evolution/evolution-1.4.6.ebuild
+++ b/mail-client/evolution/evolution-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.4.6.ebuild,v 1.5 2004/06/09 15:36:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.4.6.ebuild,v 1.6 2004/06/19 10:28:27 eradicator Exp $
 
 # kde before gnome2, otherwise kde_src_install will override gnome2_src_install
 use kde && inherit kde
@@ -141,6 +141,8 @@ src_compile() {
 	use kde && [ -n "${KDEDIR}" ] \
 		&& myconf="${myconf} --with-kde-applnk-path=${KDEDIR}/share/applnk"
 
+	use amd64 && myconf="${myconf} --with-pic"
+
 	# Use Mozilla NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
 	if use ssl && use mozilla; then
 		if has_version "dev-libs/nspr"; then
diff --git a/mail-client/evolution/files/evolution-gcc34.patch b/mail-client/evolution/files/evolution-gcc34.patch
index af750674d2bf..af09553f3512 100644
--- a/mail-client/evolution/files/evolution-gcc34.patch
+++ b/mail-client/evolution/files/evolution-gcc34.patch
@@ -1,6 +1,45 @@
-diff -Nurd evolution-1.4.6-old/calendar/cal-client/cal-client.c evolution-1.4.6/calendar/cal-client/cal-client.c
---- evolution-1.4.6-old/calendar/cal-client/cal-client.c	2004-05-23 03:14:19.266120688 -0500
-+++ evolution-1.4.6/calendar/cal-client/cal-client.c	2004-05-23 03:14:34.210848744 -0500
+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 10:45:53.000000000 -0700
++++ evolution-1.4.6/addressbook/conduit/address-conduit.c	2004-06-18 23:10:02.366091330 -0700
+@@ -609,7 +609,7 @@
+ 		return E_CARD_SIMPLE_FIELD_EMAIL_2;
+ 	case E_CARD_SIMPLE_FIELD_EMAIL_2:
+ 		return E_CARD_SIMPLE_FIELD_EMAIL_3;
+-	default:
++	default: break;
+ 	}
+ 
+ 	return E_CARD_SIMPLE_FIELD_LAST;
+@@ -624,7 +624,7 @@
+ 	switch (*field) {
+ 	case E_CARD_SIMPLE_FIELD_PHONE_HOME:
+ 		return E_CARD_SIMPLE_FIELD_PHONE_HOME_2;
+-	default:
++	default: break;
+ 	}
+ 
+ 	return E_CARD_SIMPLE_FIELD_LAST;
+@@ -639,7 +639,7 @@
+ 	switch (*field) {
+ 	case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS:
+ 		return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2;
+-	default:
++	default: break;
+ 	}
+ 
+ 	return E_CARD_SIMPLE_FIELD_LAST;
+@@ -656,7 +656,7 @@
+ 		return E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX;
+ 	case E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX:
+ 		return E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX;
+-	default:
++	default: break;
+ 	}
+ 
+ 	return E_CARD_SIMPLE_FIELD_LAST;
+diff -Naur evolution-1.4.6.orig/calendar/cal-client/cal-client.c evolution-1.4.6/calendar/cal-client/cal-client.c
+--- evolution-1.4.6.orig/calendar/cal-client/cal-client.c	2003-07-15 15:24:47.000000000 -0700
++++ evolution-1.4.6/calendar/cal-client/cal-client.c	2004-06-18 23:09:18.303892968 -0700
 @@ -2886,7 +2886,7 @@
  	return cal_client_remove_object_with_mod (client, uid, CALOBJ_MOD_ALL);
  }
@@ -10,9 +49,9 @@ diff -Nurd evolution-1.4.6-old/calendar/cal-client/cal-client.c evolution-1.4.6/
  cal_client_send_object (CalClient *client, icalcomponent *icalcomp, 
  			icalcomponent **new_icalcomp, GList **users,
  			char error_msg[256])
-diff -Nurd evolution-1.4.6-old/calendar/gui/e-day-view.c evolution-1.4.6/calendar/gui/e-day-view.c
---- evolution-1.4.6-old/calendar/gui/e-day-view.c	2004-05-23 03:14:19.238124944 -0500
-+++ evolution-1.4.6/calendar/gui/e-day-view.c	2004-05-23 03:14:40.862837488 -0500
+diff -Naur evolution-1.4.6.orig/calendar/gui/e-day-view.c evolution-1.4.6/calendar/gui/e-day-view.c
+--- evolution-1.4.6.orig/calendar/gui/e-day-view.c	2003-08-11 20:14:21.000000000 -0700
++++ evolution-1.4.6/calendar/gui/e-day-view.c	2004-06-18 23:09:18.309891905 -0700
 @@ -3236,6 +3236,7 @@
  		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
  		return TRUE;
@@ -29,9 +68,9 @@ diff -Nurd evolution-1.4.6-old/calendar/gui/e-day-view.c evolution-1.4.6/calenda
  	}
  
  	return FALSE;
-diff -Nurd evolution-1.4.6-old/e-util/e-component-listener.c evolution-1.4.6/e-util/e-component-listener.c
---- evolution-1.4.6-old/e-util/e-component-listener.c	2004-05-23 03:14:19.227126616 -0500
-+++ evolution-1.4.6/e-util/e-component-listener.c	2004-05-23 03:14:30.000488816 -0500
+diff -Naur evolution-1.4.6.orig/e-util/e-component-listener.c evolution-1.4.6/e-util/e-component-listener.c
+--- evolution-1.4.6.orig/e-util/e-component-listener.c	2003-06-04 08:05:09.000000000 -0700
++++ evolution-1.4.6/e-util/e-component-listener.c	2004-06-18 23:09:18.311891551 -0700
 @@ -53,6 +53,7 @@
  			g_object_unref (cl);
  			break;
@@ -40,9 +79,9 @@ diff -Nurd evolution-1.4.6-old/e-util/e-component-listener.c evolution-1.4.6/e-u
  		}
  	}
  }
-diff -Nurd evolution-1.4.6-old/mail/message-browser.c evolution-1.4.6/mail/message-browser.c
---- evolution-1.4.6-old/mail/message-browser.c	2004-05-23 03:14:19.055152760 -0500
-+++ evolution-1.4.6/mail/message-browser.c	2004-05-23 03:14:44.330310352 -0500
+diff -Naur evolution-1.4.6.orig/mail/message-browser.c evolution-1.4.6/mail/message-browser.c
+--- evolution-1.4.6.orig/mail/message-browser.c	2003-07-31 19:45:05.000000000 -0700
++++ evolution-1.4.6/mail/message-browser.c	2004-06-18 23:09:18.313891197 -0700
 @@ -345,6 +345,7 @@
  		message_browser_close (NULL, mb, NULL);
  		return TRUE;