Add fix for calendar crash. Bug #86174

(Portage version: 2.1_pre3-r1)

5 files changed, 35 insertions, 20 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 6fa879aa44e4..1532f7ee769a 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/evolution-data-server
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.67 2005/12/04 23:48:51 dang Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.68 2006/01/08 22:00:49 dang Exp $
+
+  08 Jan 2006; <dang@gentoo.org>
+  evolution-data-server-1.2.3.ebuild:
+  Downgrade arm to ~ because of mozilla dep, to allow repoman to commit
+
+  08 Jan 2006; <dang@gentoo.org>
+  +files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch,
+  evolution-data-server-1.4.2.1.ebuild:
+  Add fix for calendar crash. Bug #86174
 
   04 Dec 2005; <dang@gentoo.org> evolution-data-server-1.4.2.1.ebuild:
   Begin removing mozilla/firefox as sources for nspf/nss per mozilla herd
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 6e6af5805461..929a6411ffee 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,13 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f5ae24998e779e1643e0cc6bccc60803 ChangeLog 9676
+MD5 3c6aa8908d1057fb0a234018e6d55604 ChangeLog 9856
 MD5 98bdbed2d5ce2bec87868d9a46b5f3b0 evolution-data-server-1.0.2.ebuild 1065
 MD5 368efaf736537929d3c127b9608a1ae2 evolution-data-server-1.0.3.ebuild 983
 MD5 4f1c59c7610ff6bcd04eae2d1c044753 evolution-data-server-1.0.4.ebuild 985
-MD5 e3a6586c651eb7025b3a7e6aec86c1b2 evolution-data-server-1.2.3.ebuild 2538
+MD5 380db5a0bafc6bc9b3ff8b71ca4d25dd evolution-data-server-1.2.3.ebuild 2539
 MD5 36265d101a2a38d3dd1d8c529614017b evolution-data-server-1.4.1.1.ebuild 3599
-MD5 6d8ba8d0c0b07f4a12f4e7cdfe627e84 evolution-data-server-1.4.2.1.ebuild 2710
+MD5 6d072697b648096b9554b0a9d88ec0c9 evolution-data-server-1.4.2.1.ebuild 2809
 MD5 e72d151eb141e23240770c222c39e317 files/digest-evolution-data-server-1.0.2 81
 MD5 dfc34218a032bcd275fc5fb09376abea files/digest-evolution-data-server-1.0.3 81
 MD5 677d10afd2898cc22305dd302a01d2e7 files/digest-evolution-data-server-1.0.4 81
@@ -18,12 +15,6 @@ MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mut
 MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
 MD5 f198c2b5ab564c7e450ae07be5b1efc5 files/evolution-data-server-1.2.1-local-provider.patch 892
 MD5 9301f93589ecd825aa39e32465a707a3 files/evolution-data-server-1.2.3-gcc4.patch 558
+MD5 e60b90d23a97fbaabc6d4d3467dc47b2 files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch 699
 MD5 31de33250de9b6fe2dba0deae946db46 files/evolution-data-server-no_lazy_bindings.patch 551
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDk4BcomPajV0RnrERAt1NAJsH8BUFxKH9MnYIntWY7/7Bk64JiACeKMC0
-AeDPbg3eaxq8XWNepzDvP24=
-=Q/Oa
------END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.2.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.2.3.ebuild
index f0b5eac5c8d6..011c5643856d 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.2.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.2.3.ebuild,v 1.14 2005/10/10 08:04:09 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.2.3.ebuild,v 1.15 2006/01/08 22:00:49 dang Exp $
 
 inherit eutils gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.ximian.com/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 mips ppc ~ppc64 sparc x86"
 IUSE="doc ldap mozilla ssl ipv6 nntp kerberos"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.4.2.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.4.2.1.ebuild
index b4716540b4e2..41afdb01d3eb 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.4.2.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.4.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.4.2.1.ebuild,v 1.2 2005/12/04 23:48:51 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.4.2.1.ebuild,v 1.3 2006/01/08 22:00:49 dang Exp $
 
 inherit eutils gnome2
 
@@ -72,6 +72,9 @@ src_unpack() {
 	# Resolve symbols at execution time for setgid binaries
 	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
 
+	# Fix calandar crashing, bug #86174
+	epatch "${FILESDIR}"/${PN}-1.4.2.1-calandar-crash-fix.patch
+
 	sed -n -e '/GNOME_COMPILE_WARNINGS/,/dnl IT_PROG_INTLTOOL/p' \
 		aclocal.m4 > gnome.m4
 	export WANT_AUTOMAKE=1.9
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch
new file mode 100644
index 000000000000..077168b24419
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-data-server-1.4.2.1.orig/calendar/libecal/e-cal-recur.c evolution-data-server-1.4.2.1/calendar/libecal/e-cal-recur.c
+--- evolution-data-server-1.4.2.1.orig/calendar/libecal/e-cal-recur.c	2005-09-02 10:37:43.000000000 -0400
++++ evolution-data-server-1.4.2.1/calendar/libecal/e-cal-recur.c	2006-01-08 16:31:12.000000000 -0500
+@@ -683,7 +683,7 @@
+ 					gpointer	            tz_cb_data,
+ 					icaltimezone	 *default_timezone)
+ {
+-	ECalComponentDateTime dtstart, dtend;
++	ECalComponentDateTime dtstart = {0}, dtend = {0};
+ 	time_t dtstart_time, dtend_time;
+ 	GSList *rrules = NULL, *rdates = NULL, elem;
+ 	GSList *exrules = NULL, *exdates = NULL;