[Pkg-xfce-commits] r826 - in desktop/trunk/orage/debian: . patches

[Simon Huggins]

Author: huggie
Date: 2006-08-06 10:25:06 +0000 (Sun, 06 Aug 2006)
New Revision: 826

Added:
   desktop/trunk/orage/debian/patches/
   desktop/trunk/orage/debian/patches/00_fix_ical_for_amd64.patch
   desktop/trunk/orage/debian/patches/01_more_ical_fixes.patch
   desktop/trunk/orage/debian/patches/02_further_ical_fixes.patch
Modified:
   desktop/trunk/orage/debian/changelog
Log:
AMD64 fixes.  Release.


Modified: desktop/trunk/orage/debian/changelog
===================================================================
--- desktop/trunk/orage/debian/changelog	2006-08-06 08:21:51 UTC (rev 825)
+++ desktop/trunk/orage/debian/changelog	2006-08-06 10:25:06 UTC (rev 826)
@@ -1,3 +1,9 @@
+orage (4.3.90.2-3) unstable; urgency=low
+
+  * Include patch to fix amd64 issues in ical code              closes: #370273
+
+ -- Simon Huggins <huggie at earth.li>  Sun, 06 Aug 2006 11:03:42 +0100
+
 orage (4.3.90.2-2) unstable; urgency=low
 
   * Depend on xfce4-panel-dev with correct shlibs.

Added: desktop/trunk/orage/debian/patches/00_fix_ical_for_amd64.patch
===================================================================
--- desktop/trunk/orage/debian/patches/00_fix_ical_for_amd64.patch	2006-08-06 08:21:51 UTC (rev 825)
+++ desktop/trunk/orage/debian/patches/00_fix_ical_for_amd64.patch	2006-08-06 10:25:06 UTC (rev 826)
@@ -0,0 +1,13 @@
+diff -Naurp src.orig/ical-code.c src/ical-code.c
+--- src.orig/ical-code.c	2006-07-10 14:34:41.000000000 +0200
++++ src/ical-code.c	2006-07-30 14:33:36.000000000 +0200
+@@ -1246,7 +1246,7 @@ char *appt_add_internal(appt_data *appt,
+            , icalproperty_new_class(ICAL_CLASS_PUBLIC)
+            , icalproperty_new_dtstamp(dtstamp)
+            , icalproperty_new_created(create_time)
+-           , 0);
++           , NULL);
+ 
+     if XFICAL_STR_EXISTS(appt->title)
+         icalcomponent_add_property(ievent
+

Added: desktop/trunk/orage/debian/patches/01_more_ical_fixes.patch
===================================================================
--- desktop/trunk/orage/debian/patches/01_more_ical_fixes.patch	2006-08-06 08:21:51 UTC (rev 825)
+++ desktop/trunk/orage/debian/patches/01_more_ical_fixes.patch	2006-08-06 10:25:06 UTC (rev 826)
@@ -0,0 +1,15 @@
+Index: libical/src/libicalss/icalmessage.c
+===================================================================
+--- libical/src/libicalss/icalmessage.c	(revision 22673)
++++ libical/src/libicalss/icalmessage.c	(working copy)
+@@ -123,8 +123,8 @@
+ 	icalcomponent_vanew(
+ 	    ICAL_VEVENT_COMPONENT,
+ 	    icalproperty_new_dtstamp(icaltime_from_timet(time(0),0)),
+-	    0),
+-	0);
++	    NULL),
++	NULL);
+ 
+     icalcomponent *inner = icalmessage_get_inner(reply);
+ 

Added: desktop/trunk/orage/debian/patches/02_further_ical_fixes.patch
===================================================================
--- desktop/trunk/orage/debian/patches/02_further_ical_fixes.patch	2006-08-06 08:21:51 UTC (rev 825)
+++ desktop/trunk/orage/debian/patches/02_further_ical_fixes.patch	2006-08-06 10:25:06 UTC (rev 826)
@@ -0,0 +1,31 @@
+Index: src/ical-code.c
+===================================================================
+--- src/ical-code.c	(revision 22673)
++++ src/ical-code.c	(working copy)
+@@ -629,7 +629,7 @@
+             *p_ical = icalcomponent_vanew(ICAL_VCALENDAR_COMPONENT
+                    , icalproperty_new_version("2.0")
+                    , icalproperty_new_prodid("-//Xfce//Orage//EN")
+-                   , 0);
++                   , NULL);
+             xfical_add_timezone(*p_ical, *p_fical, local_icaltimezone_location);
+             icalset_add_component(*p_fical, *p_ical);
+             /*
+@@ -1182,7 +1182,7 @@
+     ialarm = icalcomponent_vanew(ICAL_VALARM_COMPONENT
+         , icalproperty_new_action(ICAL_ACTION_DISPLAY)
+         , icalproperty_new_trigger(trg)
+-        , 0);
++        , NULL);
+     if XFICAL_STR_EXISTS(appt->note)
+         icalcomponent_add_property(ialarm
+             , icalproperty_new_description(appt->note));
+@@ -1198,7 +1198,7 @@
+         ialarm = icalcomponent_vanew(ICAL_VALARM_COMPONENT
+             , icalproperty_new_action(ICAL_ACTION_AUDIO)
+             , icalproperty_new_trigger(trg)
+-            , 0);
++            , NULL);
+         attach = icalattach_new_from_url(appt->sound);
+         icalcomponent_add_property(ialarm
+             , icalproperty_new_attach(attach));