Debian Codegraph @

project/bundles/3rdparty/ext_kf5/kcalendarcore-libical.patch

raw
1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index 1d4734e3a..ce91fc3e8 100644
3 --- a/CMakeLists.txt
4 +++ b/CMakeLists.txt
5 @@ -49,7 +49,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KCALENDARCORE
6 ########### Find packages ###########
7 find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui)
8
9 -set(LibIcal_MIN_VERSION "3.0")
10 +#set(LibIcal_MIN_VERSION "3.0")
11 # TODO remove our FindLibIcal.cmake in favor of upstream LibIcalConfig.cmake once the following issues are resolved:
12 # https://github.com/libical/libical/pull/510
13 # https://bugs.launchpad.net/ubuntu/+source/libical3/+bug/1946963
14 diff --git a/src/icalformat_p.cpp b/src/icalformat_p.cpp
15 index a21a2544b..f6888e54d 100644
16 --- a/src/icalformat_p.cpp
17 +++ b/src/icalformat_p.cpp
18 @@ -471,12 +471,12 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent, const Incidence::Ptr
19 if (secClass != ICAL_CLASS_PUBLIC) {
20 icalcomponent_add_property(parent, icalproperty_new_class(secClass));
21 }
22 -
23 +/*
24 // color
25 if (!incidence->color().isEmpty()) {
26 icalcomponent_add_property(parent, icalproperty_new_color(incidence->color().toUtf8().constData()));
27 }
28 -
29 +*/
30 // geo
31 if (incidence->hasGeo()) {
32 icalgeotype geo;
33 @@ -564,13 +564,13 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent, const Incidence::Ptr
34 for (auto it = alarms.cbegin(), end = alarms.cend(); it != end; ++it) {
35 icalcomponent_add_component(parent, writeAlarm(*it));
36 }
37 -
38 +/*
39 // conferences
40 const auto conferences = incidence->conferences();
41 for (const auto &conf : conferences) {
42 icalcomponent_add_property(parent, writeConference(conf));
43 }
44 -
45 +*/
46 // duration
47 if (incidence->hasDuration()) {
48 icaldurationtype duration;
49 @@ -1070,7 +1070,7 @@ icalcomponent *ICalFormatImpl::writeAlarm(const Alarm::Ptr &alarm)
50
51 return a;
52 }
53 -
54 +/*
55 icalproperty *ICalFormatImpl::writeConference(const Conference &conference)
56 {
57 icalproperty *p = icalproperty_new_conference(conference.uri().toString().toUtf8().constData());
58 @@ -1080,7 +1080,7 @@ icalproperty *ICalFormatImpl::writeConference(const Conference &conference)
59
60 return p;
61 }
62 -
63 +*/
64 Todo::Ptr ICalFormatImpl::readTodo(icalcomponent *vtodo, const ICalTimeZoneCache *tzlist)
65 {
66 Todo::Ptr todo(new Todo);
67 @@ -1801,11 +1801,11 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, const Incidence::Ptr &
68 case ICAL_ATTACH_PROPERTY: // attachments
69 incidence->addAttachment(readAttachment(p));
70 break;
71 -
72 +/*
73 case ICAL_COLOR_PROPERTY:
74 incidence->setColor(QString::fromUtf8(icalproperty_get_color(p)));
75 break;
76 -
77 +*/
78 default:
79 // TODO: do something about unknown properties?
80 break;
81 @@ -1837,7 +1837,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, const Incidence::Ptr &
82 alarm = icalcomponent_get_next_component(parent, ICAL_VALARM_COMPONENT)) {
83 readAlarm(alarm, incidence);
84 }
85 -
86 +/*
87 // iterate through all conferences
88 Conference::List conferences;
89 for (auto *conf = icalcomponent_get_first_property(parent, ICAL_CONFERENCE_PROPERTY); conf;
90 @@ -1845,7 +1845,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, const Incidence::Ptr &
91 conferences.push_back(readConference(conf));
92 }
93 incidence->setConferences(conferences);
94 -
95 +*/
96 if (mCompat) {
97 // Fix incorrect alarm settings by other applications (like outloook 9)
98 mCompat->fixAlarms(incidence);
99 @@ -2255,7 +2255,7 @@ icaldatetimeperiodtype ICalFormatImpl::writeICalDatePeriod(const QDate &date)
100 t.period = icalperiodtype_null_period();
101 return t;
102 }
103 -
104 +/*
105 Conference ICalFormatImpl::readConference(icalproperty *prop)
106 {
107 Conference conf;
108 @@ -2265,7 +2265,7 @@ Conference ICalFormatImpl::readConference(icalproperty *prop)
109 conf.setLanguage(QString::fromUtf8(icalproperty_get_parameter_as_string(prop, "LANGUAGE")));
110 return conf;
111 }
112 -
113 +*/
114 icaltimetype ICalFormatImpl::writeICalDate(const QDate &date)
115 {
116 icaltimetype t = icaltime_null_time();
117 diff --git a/src/icalformat_p.h b/src/icalformat_p.h
118 index 7388756a7..426ea785c 100644
119 --- a/src/icalformat_p.h
120 +++ b/src/icalformat_p.h
121 @@ -121,7 +121,7 @@ public:
122 icalproperty *writeRecurrenceRule(Recurrence *);
123 icalrecurrencetype writeRecurrenceRule(RecurrenceRule *recur);
124 icalcomponent *writeAlarm(const Alarm::Ptr &alarm);
125 - icalproperty *writeConference(const Conference &conference);
126 +// icalproperty *writeConference(const Conference &conference);
127
128 QString extractErrorProperty(icalcomponent *);
129 Todo::Ptr readTodo(icalcomponent *vtodo, const ICalTimeZoneCache *tzList);
130 @@ -136,7 +136,7 @@ public:
131 void readExceptionRule(icalproperty *rrule, const Incidence::Ptr &incidence);
132 void readRecurrence(const struct icalrecurrencetype &r, RecurrenceRule *recur);
133 void readAlarm(icalcomponent *alarm, const Incidence::Ptr &incidence);
134 - Conference readConference(icalproperty *conference);
135 +// Conference readConference(icalproperty *conference);
136
137 /**
138 Returns the PRODID string loaded from calendar file.