Add a patch to fix some KDE bugs (from Carlo)

(Portage version: 2.1_pre10-r5)

4 files changed, 70 insertions, 1 deletions

diff --git a/kde-base/libkcal/ChangeLog b/kde-base/libkcal/ChangeLog
index 50169762937a..14ccd052db0d 100644
--- a/kde-base/libkcal/ChangeLog
+++ b/kde-base/libkcal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkcal
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcal/ChangeLog,v 1.43 2006/04/27 22:12:04 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcal/ChangeLog,v 1.44 2006/05/12 12:10:20 caleb Exp $
+
+*libkcal-3.5.2-r1 (12 May 2006)
+
+  12 May 2006; Caleb Tennis <caleb@gentoo.org>
+  +files/libkcal-3.5.2-fixes.diff, +libkcal-3.5.2-r1.ebuild:
+  Add a patch to fix some KDE bugs (from Carlo)
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-libkcal-3.4.1,
   files/digest-libkcal-3.4.2, files/digest-libkcal-3.4.3, Manifest:
diff --git a/kde-base/libkcal/files/digest-libkcal-3.5.2-r1 b/kde-base/libkcal/files/digest-libkcal-3.5.2-r1
new file mode 100644
index 000000000000..614bd87074cf
--- /dev/null
+++ b/kde-base/libkcal/files/digest-libkcal-3.5.2-r1
@@ -0,0 +1,3 @@
+MD5 ac6b3b503e27a65a7b883c1e0a57262e kdepim-3.5.2.tar.bz2 12887336
+RMD160 8e6571d14bbf6b3370c4fdb108a1a79625e87365 kdepim-3.5.2.tar.bz2 12887336
+SHA256 9c038a80912894b3ec132b2c7219ec5549ca80dcdeec88555928d2e038966539 kdepim-3.5.2.tar.bz2 12887336
diff --git a/kde-base/libkcal/files/libkcal-3.5.2-fixes.diff b/kde-base/libkcal/files/libkcal-3.5.2-fixes.diff
new file mode 100644
index 000000000000..a357e45c31c4
--- /dev/null
+++ b/kde-base/libkcal/files/libkcal-3.5.2-fixes.diff
@@ -0,0 +1,39 @@
+--- kdepim/libkcal/libical/src/libical/icalarray.c	2005/07/26 18:54:59	438982
++++ kdepim/libkcal/libical/src/libical/icalarray.c	2006/05/06 09:14:35	537923
+@@ -149,10 +149,10 @@
+ 			new_space_allocated * array->element_size);
+ 	*/
+ 	new_data = malloc(new_space_allocated * array->element_size);
+-	memcpy(new_data,array->data,array->element_size*array->space_allocated);
+-	free(array->data);
+ 
+     if (new_data) {
++    	memcpy(new_data,array->data,array->element_size*array->space_allocated);
++	free(array->data);
+ 	array->data = new_data;
+ 	array->space_allocated = new_space_allocated;
+     } else {
+--- kdepim/libkcal/libical/src/libical/icalcomponent.c	2005/09/18 12:37:01	461680
++++ kdepim/libkcal/libical/src/libical/icalcomponent.c	2006/05/06 09:14:35	537923
+@@ -848,8 +848,8 @@
+ 
+   /** Now test against the EXRULEs **/
+   for (exrule = icalcomponent_get_first_property(comp,ICAL_EXRULE_PROPERTY);
+-       exdate != NULL;
+-       exdate = icalcomponent_get_next_property(comp,ICAL_EXRULE_PROPERTY)) {
++       exrule != NULL;
++       exrule = icalcomponent_get_next_property(comp,ICAL_EXRULE_PROPERTY)) {
+ 	 
+     struct icalrecurrencetype recur = icalproperty_get_exrule(exrule);
+     icalrecur_iterator *exrule_itr  = icalrecur_iterator_new(recur, *dtstart);
+--- kdepim/libkcal/libical/src/libical/icaltypes.c	2005/07/26 18:54:59	438982
++++ kdepim/libkcal/libical/src/libical/icaltypes.c	2006/05/06 09:14:35	537923
+@@ -77,7 +77,7 @@
+ 
+     
+     struct icaltriggertype tr, null_tr;
+-    icalerrorstate es;
++    icalerrorstate es = ICAL_ERROR_UNKNOWN;
+     icalerrorenum e;
+ 
+     tr.time= icaltime_null_time();
diff --git a/kde-base/libkcal/libkcal-3.5.2-r1.ebuild b/kde-base/libkcal/libkcal-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..4255b23ccfab
--- /dev/null
+++ b/kde-base/libkcal/libkcal-3.5.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcal/libkcal-3.5.2-r1.ebuild,v 1.1 2006/05/12 12:10:20 caleb Exp $
+
+KMNAME=kdepim
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE kcal library for korganizer etc"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="
+$(deprange $PV $MAXKDEVER kde-base/ktnef)"
+
+KMCOPYLIB="libktnef ktnef/lib"
+KMEXTRACTONLY="libkdepim/email.h"
+KMCOMPILEONLY="libemailfunctions/"
+
+PATCHES="${FILESDIR}/libkcal-3.5.2-fixes.diff"