app-admin/conky/files/conky-1.10.8-libical-3.patch

   1 From 128c8cce3415839a3d19a5cb877fd77af2538d35 Mon Sep 17 00:00:00 2001
   2 From: Adam Majer <amajer@suse.de>
   3 Date: Tue, 6 Mar 2018 13:46:31 +0100
   4 Subject: [PATCH] Add support for libical 3.x (#465)
   5
   6 In libical3, deprecated icaltime_from_timet is removed
   7 Use icaltime_from_timet_with_zone instead. This function
   8 exists in libical 2.x so no need to change requirements
   9 ---
  10  src/ical.cc | 4 ++--
  11  1 file changed, 2 insertions(+), 2 deletions(-)
  12
  13 diff --git a/src/ical.cc b/src/ical.cc
  14 index e4b48511..ef069124 100644
  15 --- a/src/ical.cc
  16 +++ b/src/ical.cc
  17 @@ -49,13 +49,13 @@ struct ical_event *add_event(struct ical_event *listend, icalcomponent *new_ev)
  18         icaltimetype start;
  19
  20         start = icalcomponent_get_dtstart(new_ev);
  21 -       if(icaltime_compare(start, icaltime_from_timet(time(NULL), 0)) <= 0) {
  22 +       if(icaltime_compare(start, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) <= 0) {
  23                 icalproperty *rrule = icalcomponent_get_first_property(new_ev, ICAL_RRULE_PROPERTY);
  24                 if(rrule) {
  25                         icalrecur_iterator* ritr = icalrecur_iterator_new(icalproperty_get_rrule(rrule), start);
  26                         icaltimetype nexttime = icalrecur_iterator_next(ritr);
  27                         while (!icaltime_is_null_time(nexttime)) {
  28 -                               if(icaltime_compare(nexttime, icaltime_from_timet(time(NULL), 0)) > 0) {
  29 +                               if(icaltime_compare(nexttime, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) > 0) {
  30                                         start = nexttime;
  31                                         break;
  32                                 }