3rdparty/ext_kf5/kcalendarcore-libical.patch

0001 diff --git a/CMakeLists.txt b/CMakeLists.txt
0002 index 1d4734e3a..ce91fc3e8 100644
0003 --- a/CMakeLists.txt
0004 +++ b/CMakeLists.txt
0005 @@ -49,7 +49,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KCALENDARCORE
0006  ########### Find packages ###########
0007  find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui)
0008
0009 -set(LibIcal_MIN_VERSION "3.0")
0010 +#set(LibIcal_MIN_VERSION "3.0")
0011  # TODO remove our FindLibIcal.cmake in favor of upstream LibIcalConfig.cmake once the following issues are resolved:
0012  # https://github.com/libical/libical/pull/510
0013  # https://bugs.launchpad.net/ubuntu/+source/libical3/+bug/1946963
0014 diff --git a/src/icalformat_p.cpp b/src/icalformat_p.cpp
0015 index a21a2544b..f6888e54d 100644
0016 --- a/src/icalformat_p.cpp
0017 +++ b/src/icalformat_p.cpp
0018 @@ -471,12 +471,12 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent, const Incidence::Ptr
0019      if (secClass != ICAL_CLASS_PUBLIC) {
0020          icalcomponent_add_property(parent, icalproperty_new_class(secClass));
0021      }
0022 -
0023 +/*
0024      // color
0025      if (!incidence->color().isEmpty()) {
0026          icalcomponent_add_property(parent, icalproperty_new_color(incidence->color().toUtf8().constData()));
0027      }
0028 -
0029 +*/
0030      // geo
0031      if (incidence->hasGeo()) {
0032          icalgeotype geo;
0033 @@ -564,13 +564,13 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent, const Incidence::Ptr
0034      for (auto it = alarms.cbegin(), end = alarms.cend(); it != end; ++it) {
0035          icalcomponent_add_component(parent, writeAlarm(*it));
0036      }
0037 -
0038 +/*
0039      // conferences
0040      const auto conferences = incidence->conferences();
0041      for (const auto &conf : conferences) {
0042          icalcomponent_add_property(parent, writeConference(conf));
0043      }
0044 -
0045 +*/
0046      // duration
0047      if (incidence->hasDuration()) {
0048          icaldurationtype duration;
0049 @@ -1070,7 +1070,7 @@ icalcomponent *ICalFormatImpl::writeAlarm(const Alarm::Ptr &alarm)
0050
0051      return a;
0052  }
0053 -
0054 +/*
0055  icalproperty *ICalFormatImpl::writeConference(const Conference &conference)
0056  {
0057      icalproperty *p = icalproperty_new_conference(conference.uri().toString().toUtf8().constData());
0058 @@ -1080,7 +1080,7 @@ icalproperty *ICalFormatImpl::writeConference(const Conference &conference)
0059
0060      return p;
0061  }
0062 -
0063 +*/
0064  Todo::Ptr ICalFormatImpl::readTodo(icalcomponent *vtodo, const ICalTimeZoneCache *tzlist)
0065  {
0066      Todo::Ptr todo(new Todo);
0067 @@ -1801,11 +1801,11 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, const Incidence::Ptr &
0068          case ICAL_ATTACH_PROPERTY: // attachments
0069              incidence->addAttachment(readAttachment(p));
0070              break;
0071 -
0072 +/*
0073          case ICAL_COLOR_PROPERTY:
0074              incidence->setColor(QString::fromUtf8(icalproperty_get_color(p)));
0075              break;
0076 -
0077 +*/
0078          default:
0079              // TODO: do something about unknown properties?
0080              break;
0081 @@ -1837,7 +1837,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, const Incidence::Ptr &
0082           alarm = icalcomponent_get_next_component(parent, ICAL_VALARM_COMPONENT)) {
0083          readAlarm(alarm, incidence);
0084      }
0085 -
0086 +/*
0087      // iterate through all conferences
0088      Conference::List conferences;
0089      for (auto *conf = icalcomponent_get_first_property(parent, ICAL_CONFERENCE_PROPERTY); conf;
0090 @@ -1845,7 +1845,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, const Incidence::Ptr &
0091          conferences.push_back(readConference(conf));
0092      }
0093      incidence->setConferences(conferences);
0094 -
0095 +*/
0096      if (mCompat) {
0097          // Fix incorrect alarm settings by other applications (like outloook 9)
0098          mCompat->fixAlarms(incidence);
0099 @@ -2255,7 +2255,7 @@ icaldatetimeperiodtype ICalFormatImpl::writeICalDatePeriod(const QDate &date)
0100      t.period = icalperiodtype_null_period();
0101      return t;
0102  }
0103 -
0104 +/*
0105  Conference ICalFormatImpl::readConference(icalproperty *prop)
0106  {
0107      Conference conf;
0108 @@ -2265,7 +2265,7 @@ Conference ICalFormatImpl::readConference(icalproperty *prop)
0109      conf.setLanguage(QString::fromUtf8(icalproperty_get_parameter_as_string(prop, "LANGUAGE")));
0110      return conf;
0111  }
0112 -
0113 +*/
0114  icaltimetype ICalFormatImpl::writeICalDate(const QDate &date)
0115  {
0116      icaltimetype t = icaltime_null_time();
0117 diff --git a/src/icalformat_p.h b/src/icalformat_p.h
0118 index 7388756a7..426ea785c 100644
0119 --- a/src/icalformat_p.h
0120 +++ b/src/icalformat_p.h
0121 @@ -121,7 +121,7 @@ public:
0122      icalproperty *writeRecurrenceRule(Recurrence *);
0123      icalrecurrencetype writeRecurrenceRule(RecurrenceRule *recur);
0124      icalcomponent *writeAlarm(const Alarm::Ptr &alarm);
0125 -    icalproperty *writeConference(const Conference &conference);
0126 +//    icalproperty *writeConference(const Conference &conference);
0127
0128      QString extractErrorProperty(icalcomponent *);
0129      Todo::Ptr readTodo(icalcomponent *vtodo, const ICalTimeZoneCache *tzList);
0130 @@ -136,7 +136,7 @@ public:
0131      void readExceptionRule(icalproperty *rrule, const Incidence::Ptr &incidence);
0132      void readRecurrence(const struct icalrecurrencetype &r, RecurrenceRule *recur);
0133      void readAlarm(icalcomponent *alarm, const Incidence::Ptr &incidence);
0134 -    Conference readConference(icalproperty *conference);
0135 +//    Conference readConference(icalproperty *conference);
0136
0137      /**
0138        Returns the PRODID string loaded from calendar file.