1 |
commit: 3d905db98e4e2542be61b93b4774760c53c384a9 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 2 17:19:32 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 3 05:03:08 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d905db9 |
7 |
|
8 |
app-office/calligraplan: Drop 3.1.0-r1 and 3.1.0-r3 |
9 |
|
10 |
And a lot of patches. |
11 |
|
12 |
Package-Manager: Portage-2.3.80, Repoman-2.3.19 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
app-office/calligraplan/Manifest | 1 - |
16 |
.../calligraplan/calligraplan-3.1.0-r1.ebuild | 97 ---------------- |
17 |
.../calligraplan/calligraplan-3.1.0-r3.ebuild | 99 ---------------- |
18 |
.../calligraplan-3.1.0-kcalcore-19.08-1.patch | 46 -------- |
19 |
.../calligraplan-3.1.0-kcalcore-19.08-2.patch | 84 -------------- |
20 |
.../files/calligraplan-3.1.0-missing-header.patch | 24 ---- |
21 |
.../files/calligraplan-3.1.0-qca.patch | 127 --------------------- |
22 |
.../files/calligraplan-3.1.0-qt-5.11.patch | 124 -------------------- |
23 |
.../files/calligraplan-3.1.0-unused-deps.patch | 57 --------- |
24 |
app-office/calligraplan/metadata.xml | 1 - |
25 |
10 files changed, 660 deletions(-) |
26 |
|
27 |
diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest |
28 |
index 11fac6f2280..0af8917299c 100644 |
29 |
--- a/app-office/calligraplan/Manifest |
30 |
+++ b/app-office/calligraplan/Manifest |
31 |
@@ -1,2 +1 @@ |
32 |
-DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 |
33 |
DIST calligraplan-3.2.1.tar.xz 3417328 BLAKE2B dee2fe03a013abee0fab17495b98927eaf6ef3d2d4daaa344fccfcbd06dbaeb64717d4e844dc8659c61773a39a367fe3f93ba69b621a4dfaa9919835112e5ce9 SHA512 cd73a6ef0b9230f41d5edfeffb3664465643ca7dde8179eab0f7e4fc5e26d1331d110222256bbe18926feb39a2928abbaf0186af0376e7262df2f863941696c5 |
34 |
|
35 |
diff --git a/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild b/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild |
36 |
deleted file mode 100644 |
37 |
index 98cc37a7595..00000000000 |
38 |
--- a/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,97 +0,0 @@ |
41 |
-# Copyright 1999-2019 Gentoo Authors |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
- |
44 |
-EAPI=7 |
45 |
- |
46 |
-KDE_HANDBOOK="forceoptional" |
47 |
-KDE_TEST="forceoptional" |
48 |
-inherit kde5 |
49 |
- |
50 |
-DESCRIPTION="Project management application" |
51 |
-HOMEPAGE="https://www.calligra.org/" |
52 |
-SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz" |
53 |
- |
54 |
-LICENSE="GPL-2" |
55 |
-KEYWORDS="amd64 x86" |
56 |
-IUSE="activities +holidays kwallet pim X" |
57 |
- |
58 |
-# FIXME: Disabled by upstream for good reason |
59 |
-# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940) |
60 |
-# $(add_kdeapps_dep akonadi) |
61 |
-# $(add_kdeapps_dep akonadi-contacts) |
62 |
-# Currently upstream-disabled: |
63 |
-# =dev-libs/kproperty-3.0*:5 |
64 |
-# =dev-libs/kreport-3.0*:5 |
65 |
-DEPEND=" |
66 |
- $(add_frameworks_dep karchive) |
67 |
- $(add_frameworks_dep kconfig) |
68 |
- $(add_frameworks_dep kconfigwidgets) |
69 |
- $(add_frameworks_dep kcoreaddons) |
70 |
- $(add_frameworks_dep kdbusaddons) |
71 |
- $(add_frameworks_dep kglobalaccel) |
72 |
- $(add_frameworks_dep kguiaddons) |
73 |
- $(add_frameworks_dep khtml) |
74 |
- $(add_frameworks_dep ki18n) |
75 |
- $(add_frameworks_dep kiconthemes) |
76 |
- $(add_frameworks_dep kio) |
77 |
- $(add_frameworks_dep kitemviews) |
78 |
- $(add_frameworks_dep kjobwidgets) |
79 |
- $(add_frameworks_dep knotifications) |
80 |
- $(add_frameworks_dep kparts) |
81 |
- $(add_frameworks_dep kservice) |
82 |
- $(add_frameworks_dep ktextwidgets) |
83 |
- $(add_frameworks_dep kwidgetsaddons) |
84 |
- $(add_frameworks_dep kwindowsystem) |
85 |
- $(add_frameworks_dep kxmlgui) |
86 |
- $(add_qt_dep designer) |
87 |
- $(add_qt_dep qtdbus) |
88 |
- $(add_qt_dep qtgui) |
89 |
- $(add_qt_dep qtprintsupport) |
90 |
- $(add_qt_dep qtwidgets) |
91 |
- $(add_qt_dep qtxml) |
92 |
- dev-lang/perl |
93 |
- dev-libs/kdiagram:5 |
94 |
- sys-libs/zlib |
95 |
- activities? ( $(add_frameworks_dep kactivities) ) |
96 |
- holidays? ( $(add_frameworks_dep kholidays) ) |
97 |
- kwallet? ( |
98 |
- $(add_frameworks_dep kwallet) |
99 |
- app-crypt/qca:2[qt5(+)] |
100 |
- ) |
101 |
- pim? ( |
102 |
- <kde-apps/kcalcore-19.04.50:5 |
103 |
- $(add_kdeapps_dep kcontacts) |
104 |
- ) |
105 |
- X? ( |
106 |
- $(add_qt_dep qtx11extras) |
107 |
- x11-libs/libX11 |
108 |
- ) |
109 |
-" |
110 |
-RDEPEND="${DEPEND} |
111 |
- !app-office/calligra[calligra_features_plan(-)] |
112 |
- !app-office/calligra-l10n:4 |
113 |
- $(add_qt_dep qtsvg) |
114 |
-" |
115 |
- |
116 |
-RESTRICT+=" test" |
117 |
- |
118 |
-PATCHES=( |
119 |
- "${FILESDIR}"/${P}-qt-5.11.patch |
120 |
- "${FILESDIR}"/${P}-qca.patch |
121 |
- "${FILESDIR}"/${P}-missing-header.patch |
122 |
- "${FILESDIR}"/${P}-unused-deps.patch |
123 |
-) |
124 |
- |
125 |
-src_configure() { |
126 |
- local mycmakeargs=( |
127 |
- $(cmake-utils_use_find_package activities KF5Activities) |
128 |
- $(cmake-utils_use_find_package holidays KF5Holidays) |
129 |
- $(cmake-utils_use_find_package pim KF5CalendarCore) |
130 |
- $(cmake-utils_use_find_package pim KF5Contacts) |
131 |
- $(cmake-utils_use_find_package kwallet Qca-qt5) |
132 |
- $(cmake-utils_use_find_package kwallet KF5Wallet) |
133 |
- ) |
134 |
- # Qt5DBus can't be disabled because of KF5DBusAddons dependency |
135 |
- |
136 |
- kde5_src_configure |
137 |
-} |
138 |
|
139 |
diff --git a/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild b/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild |
140 |
deleted file mode 100644 |
141 |
index 2f0f38c3d9f..00000000000 |
142 |
--- a/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild |
143 |
+++ /dev/null |
144 |
@@ -1,99 +0,0 @@ |
145 |
-# Copyright 1999-2019 Gentoo Authors |
146 |
-# Distributed under the terms of the GNU General Public License v2 |
147 |
- |
148 |
-EAPI=7 |
149 |
- |
150 |
-KDE_APPS_MINIMAL="19.08.0" |
151 |
-KDE_HANDBOOK="forceoptional" |
152 |
-KDE_TEST="forceoptional" |
153 |
-inherit kde5 |
154 |
- |
155 |
-DESCRIPTION="Project management application" |
156 |
-HOMEPAGE="https://www.calligra.org/" |
157 |
-SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz" |
158 |
- |
159 |
-LICENSE="GPL-2" |
160 |
-KEYWORDS="~amd64 ~x86" |
161 |
-IUSE="activities +holidays kwallet pim X" |
162 |
- |
163 |
-# FIXME: Disabled by upstream for good reason |
164 |
-# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940) |
165 |
-# $(add_kdeapps_dep akonadi) |
166 |
-# $(add_kdeapps_dep akonadi-contacts) |
167 |
-# Currently upstream-disabled: |
168 |
-# =dev-libs/kproperty-3.0*:5 |
169 |
-# =dev-libs/kreport-3.0*:5 |
170 |
-DEPEND=" |
171 |
- $(add_frameworks_dep karchive) |
172 |
- $(add_frameworks_dep kconfig) |
173 |
- $(add_frameworks_dep kconfigwidgets) |
174 |
- $(add_frameworks_dep kcoreaddons) |
175 |
- $(add_frameworks_dep kdbusaddons) |
176 |
- $(add_frameworks_dep kglobalaccel) |
177 |
- $(add_frameworks_dep kguiaddons) |
178 |
- $(add_frameworks_dep khtml) |
179 |
- $(add_frameworks_dep ki18n) |
180 |
- $(add_frameworks_dep kiconthemes) |
181 |
- $(add_frameworks_dep kio) |
182 |
- $(add_frameworks_dep kitemviews) |
183 |
- $(add_frameworks_dep kjobwidgets) |
184 |
- $(add_frameworks_dep knotifications) |
185 |
- $(add_frameworks_dep kparts) |
186 |
- $(add_frameworks_dep kservice) |
187 |
- $(add_frameworks_dep ktextwidgets) |
188 |
- $(add_frameworks_dep kwidgetsaddons) |
189 |
- $(add_frameworks_dep kwindowsystem) |
190 |
- $(add_frameworks_dep kxmlgui) |
191 |
- $(add_qt_dep designer) |
192 |
- $(add_qt_dep qtdbus) |
193 |
- $(add_qt_dep qtgui) |
194 |
- $(add_qt_dep qtprintsupport) |
195 |
- $(add_qt_dep qtwidgets) |
196 |
- $(add_qt_dep qtxml) |
197 |
- dev-lang/perl |
198 |
- dev-libs/kdiagram:5 |
199 |
- sys-libs/zlib |
200 |
- activities? ( $(add_frameworks_dep kactivities) ) |
201 |
- holidays? ( $(add_frameworks_dep kholidays) ) |
202 |
- kwallet? ( |
203 |
- $(add_frameworks_dep kwallet) |
204 |
- app-crypt/qca:2[qt5(+)] |
205 |
- ) |
206 |
- pim? ( |
207 |
- $(add_frameworks_dep kcalendarcore) |
208 |
- $(add_frameworks_dep kcontacts) |
209 |
- ) |
210 |
- X? ( |
211 |
- $(add_qt_dep qtx11extras) |
212 |
- x11-libs/libX11 |
213 |
- ) |
214 |
-" |
215 |
-RDEPEND="${DEPEND} |
216 |
- !app-office/calligra[calligra_features_plan(-)] |
217 |
- !app-office/calligra-l10n:4 |
218 |
- $(add_qt_dep qtsvg) |
219 |
-" |
220 |
- |
221 |
-RESTRICT+=" test" |
222 |
- |
223 |
-PATCHES=( |
224 |
- "${FILESDIR}"/${P}-qt-5.11.patch |
225 |
- "${FILESDIR}"/${P}-qca.patch |
226 |
- "${FILESDIR}"/${P}-missing-header.patch |
227 |
- "${FILESDIR}"/${P}-unused-deps.patch |
228 |
- "${FILESDIR}"/${P}-kcalcore-19.08-{1,2}.patch |
229 |
-) |
230 |
- |
231 |
-src_configure() { |
232 |
- local mycmakeargs=( |
233 |
- $(cmake-utils_use_find_package activities KF5Activities) |
234 |
- $(cmake-utils_use_find_package holidays KF5Holidays) |
235 |
- $(cmake-utils_use_find_package pim KF5CalendarCore) |
236 |
- $(cmake-utils_use_find_package pim KF5Contacts) |
237 |
- $(cmake-utils_use_find_package kwallet Qca-qt5) |
238 |
- $(cmake-utils_use_find_package kwallet KF5Wallet) |
239 |
- ) |
240 |
- # Qt5DBus can't be disabled because of KF5DBusAddons dependency |
241 |
- |
242 |
- kde5_src_configure |
243 |
-} |
244 |
|
245 |
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch |
246 |
deleted file mode 100644 |
247 |
index cfe8b552d9d..00000000000 |
248 |
--- a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch |
249 |
+++ /dev/null |
250 |
@@ -1,46 +0,0 @@ |
251 |
-From 3a01affd66f8dfdcc124e23595217f3ae5a09723 Mon Sep 17 00:00:00 2001 |
252 |
-From: Dag Andersen <danders@×××××××.dk> |
253 |
-Date: Thu, 20 Jun 2019 10:52:00 +0200 |
254 |
-Subject: ICal: Adapt to api changes in KCalCore |
255 |
- |
256 |
---- |
257 |
- CMakeLists.txt | 37 +++++++++++----------- |
258 |
- src/CMakeLists.txt | 4 +++ |
259 |
- .../filters/icalendar/export/icalendarexport.cpp | 5 +++ |
260 |
- 3 files changed, 27 insertions(+), 19 deletions(-) |
261 |
- |
262 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
263 |
-index 0dabbaf..49fa642 100644 |
264 |
---- a/src/CMakeLists.txt |
265 |
-+++ b/src/CMakeLists.txt |
266 |
-@@ -75,6 +75,10 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40) |
267 |
- set(HAVE_QDATETIME_KCALCORE TRUE) |
268 |
- endif() |
269 |
- |
270 |
-+if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.11.42) |
271 |
-+ set(KCALCORE_HAVE_NO_PERSION_PTR TRUE) |
272 |
-+endif() |
273 |
-+ |
274 |
- if (PLANCHARTDEBUG) |
275 |
- add_definitions(-DPLAN_CHART_DEBUG) |
276 |
- endif () |
277 |
-diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp |
278 |
-index cd75598..ce29bfe 100644 |
279 |
---- a/src/plugins/filters/icalendar/export/icalendarexport.cpp |
280 |
-+++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp |
281 |
-@@ -141,8 +141,13 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, |
282 |
- todo->setOrganizer(node->projectNode()->leader()); |
283 |
- } |
284 |
- if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) { |
285 |
-+#if KCALCORE_HAVE_NO_PERSION_PTR |
286 |
-+ KCalCore::Person p = KCalCore::Person::fromFullName(node->leader()); |
287 |
-+ KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p.name(), p.email())); |
288 |
-+#else |
289 |
- KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader()); |
290 |
- KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email())); |
291 |
-+#endif |
292 |
- a->setRole(KCalCore::Attendee::NonParticipant); |
293 |
- todo->addAttendee(a); |
294 |
- } |
295 |
--- |
296 |
-cgit v1.1 |
297 |
|
298 |
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch |
299 |
deleted file mode 100644 |
300 |
index 02c67d5ada7..00000000000 |
301 |
--- a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch |
302 |
+++ /dev/null |
303 |
@@ -1,84 +0,0 @@ |
304 |
-From a9eaf1c98ed408fd6e8897fa9e2f99ed17db1ebc Mon Sep 17 00:00:00 2001 |
305 |
-From: David Faure <faure@×××.org> |
306 |
-Date: Tue, 23 Jul 2019 12:26:17 +0200 |
307 |
-Subject: Port to KCalCore API changes |
308 |
- |
309 |
-The code is in #if 0, but I tested compilation of this in the calligra |
310 |
-stable branch: |
311 |
-https://commits.kde.org/calligra/2d484fda1b31a72659088a4bfce5c3708e923cb0 |
312 |
- |
313 |
-So you can use KCalCore again if you want :-) |
314 |
-It's turning into a KF5 framework so the API will be stable from now on. |
315 |
- |
316 |
-CCMAIL: danders@×××××××.dk |
317 |
---- |
318 |
- .../filters/icalendar/export/icalendarexport.cpp | 20 +++++++++++++++++--- |
319 |
- 1 file changed, 17 insertions(+), 3 deletions(-) |
320 |
- |
321 |
-diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp |
322 |
-index b21320f..828b641 100644 |
323 |
---- a/src/plugins/filters/icalendar/export/icalendarexport.cpp |
324 |
-+++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp |
325 |
-@@ -35,6 +35,7 @@ |
326 |
- #include <kcalcore/attachment.h> |
327 |
- #include <kcalcore/icalformat.h> |
328 |
- #include <kcalcore/memorycalendar.h> |
329 |
-+#include <kcalcore_version.h> |
330 |
- |
331 |
- #include <QTextCodec> |
332 |
- #include <QByteArray> |
333 |
-@@ -355,14 +356,15 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, |
334 |
- todo->setOrganizer(node->projectNode()->leader()); |
335 |
- } |
336 |
- if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) { |
337 |
--#if KCALCORE_HAVE_NO_PERSION_PTR |
338 |
-+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) |
339 |
- KCalCore::Person p = KCalCore::Person::fromFullName(node->leader()); |
340 |
-- KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p.name(), p.email())); |
341 |
-+ KCalCore::Attendee a(p.name(), p.email()); |
342 |
-+ a.setRole(KCalCore::Attendee::NonParticipant); |
343 |
- #else |
344 |
- KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader()); |
345 |
- KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email())); |
346 |
--#endif |
347 |
- a->setRole(KCalCore::Attendee::NonParticipant); |
348 |
-+#endif |
349 |
- todo->addAttendee(a); |
350 |
- } |
351 |
- DateTime st = node->startTime(id); |
352 |
-@@ -381,13 +383,21 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, |
353 |
- const QList<Resource*> lst = task->requestedResources(); |
354 |
- foreach(const Resource *r, lst) { |
355 |
- if (r->type() == Resource::Type_Work) { |
356 |
-+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) |
357 |
-+ todo->addAttendee(KCalCore::Attendee(r->name(), r->email())); |
358 |
-+#else |
359 |
- todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email()))); |
360 |
-+#endif |
361 |
- } |
362 |
- } |
363 |
- } else { |
364 |
- foreach(const Resource *r, s->resources()) { |
365 |
- if (r->type() == Resource::Type_Work) { |
366 |
-+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) |
367 |
-+ todo->addAttendee(KCalCore::Attendee(r->name(), r->email())); |
368 |
-+#else |
369 |
- todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email()))); |
370 |
-+#endif |
371 |
- } |
372 |
- } |
373 |
- |
374 |
-@@ -398,7 +408,11 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, |
375 |
- todo->setPercentComplete(task->completion().percentFinished()); |
376 |
- } |
377 |
- foreach(const Document *doc, node->documents().documents()) { |
378 |
-+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) |
379 |
-+ todo->addAttachment(KCalCore::Attachment(doc->url().url())); |
380 |
-+#else |
381 |
- todo->addAttachment(KCalCore::Attachment::Ptr(new KCalCore::Attachment(doc->url().url()))); |
382 |
-+#endif |
383 |
- } |
384 |
- if (! parent.isNull()) { |
385 |
- todo->setRelatedTo(parent->uid(), KCalCore::Incidence::RelTypeParent); |
386 |
--- |
387 |
-cgit v1.1 |
388 |
|
389 |
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch b/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch |
390 |
deleted file mode 100644 |
391 |
index 4ee031865a3..00000000000 |
392 |
--- a/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch |
393 |
+++ /dev/null |
394 |
@@ -1,24 +0,0 @@ |
395 |
-From fe36bf6f0dc1f0c1e927850dd78093cfe3b7aae2 Mon Sep 17 00:00:00 2001 |
396 |
-From: Albert Astals Cid <aacid@×××.org> |
397 |
-Date: Sun, 28 Jul 2019 00:07:33 +0200 |
398 |
-Subject: Fix compile on CI |
399 |
- |
400 |
-src/workpackage/view.h:148:31: error: field m_scheduleActions has incomplete type QMap<QAction*, KPlato::Schedule*> |
401 |
---- |
402 |
- src/workpackage/view.h | 1 + |
403 |
- 1 file changed, 1 insertion(+) |
404 |
- |
405 |
-diff --git a/src/workpackage/view.h b/src/workpackage/view.h |
406 |
-index 6cae32b..cd2fc4e 100644 |
407 |
---- a/src/workpackage/view.h |
408 |
-+++ b/src/workpackage/view.h |
409 |
-@@ -24,6 +24,7 @@ |
410 |
- |
411 |
- #include <KoView.h> |
412 |
- |
413 |
-+#include <QMap> |
414 |
- #include <QStackedWidget> |
415 |
- |
416 |
- class QPrinter; |
417 |
--- |
418 |
-cgit v1.1 |
419 |
|
420 |
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch b/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch |
421 |
deleted file mode 100644 |
422 |
index 213cc9935be..00000000000 |
423 |
--- a/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch |
424 |
+++ /dev/null |
425 |
@@ -1,127 +0,0 @@ |
426 |
-From 9c5eb86128da46899e719209a92a65df012c6d8e Mon Sep 17 00:00:00 2001 |
427 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
428 |
-Date: Tue, 1 Jan 2019 19:19:19 +0100 |
429 |
-Subject: [PATCH] Re-add accidentally removed test for QCA, KF5Wallet is |
430 |
- optional |
431 |
- |
432 |
---- |
433 |
- CMakeLists.txt | 18 +++++++++++++++++- |
434 |
- src/libs/store/CMakeLists.txt | 15 +++++++-------- |
435 |
- 2 files changed, 24 insertions(+), 9 deletions(-) |
436 |
- |
437 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
438 |
-index eed9d3c..3cb4b63 100644 |
439 |
---- a/CMakeLists.txt |
440 |
-+++ b/CMakeLists.txt |
441 |
-@@ -128,7 +128,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED |
442 |
- Parts |
443 |
- # Sonnet |
444 |
- TextWidgets |
445 |
-- Wallet |
446 |
- WidgetsAddons |
447 |
- WindowSystem |
448 |
- XmlGui |
449 |
-@@ -260,6 +259,23 @@ set_package_properties(KChart PROPERTIES |
450 |
- TYPE REQUIRED |
451 |
- ) |
452 |
- |
453 |
-+## |
454 |
-+## Test for QCA2 |
455 |
-+## |
456 |
-+macro_optional_find_package(Qca-qt5 2.1.0 QUIET) |
457 |
-+set_package_properties(Qca-qt5 PROPERTIES |
458 |
-+ DESCRIPTION "Qt Cryptographic Architecture" |
459 |
-+ URL "https:/download.kde.org/stable/qca-qt5" |
460 |
-+ PURPOSE "Required for encrypted OpenDocument files and encrypted xls files support" |
461 |
-+ TYPE OPTIONAL |
462 |
-+) |
463 |
-+ |
464 |
-+find_package(KF5Wallet ${REQUIRED_KF5_VERSION}) |
465 |
-+ |
466 |
-+if(Qca-qt5_FOUND AND KF5Wallet_FOUND) |
467 |
-+ add_definitions( -DQCA2 ) |
468 |
-+endif() |
469 |
-+ |
470 |
- find_package(Perl REQUIRED) |
471 |
- find_package(ZLIB REQUIRED) |
472 |
- |
473 |
-diff --git a/src/libs/store/CMakeLists.txt b/src/libs/store/CMakeLists.txt |
474 |
-index 2c96fa7..f998264 100644 |
475 |
---- a/src/libs/store/CMakeLists.txt |
476 |
-+++ b/src/libs/store/CMakeLists.txt |
477 |
-@@ -4,14 +4,8 @@ endif() |
478 |
- |
479 |
- ########### libkostore ############### |
480 |
- |
481 |
--if( Qca-qt5_FOUND ) |
482 |
-- add_definitions( -DQCA2 ) |
483 |
--endif() |
484 |
-- |
485 |
- set(kostore_LIB_SRCS |
486 |
- KoDirectoryStore.cpp |
487 |
-- KoEncryptedStore.cpp |
488 |
-- KoEncryptionChecker.cpp |
489 |
- KoLZF.cpp |
490 |
- KoStore.cpp |
491 |
- KoStoreDevice.cpp |
492 |
-@@ -23,6 +17,12 @@ set(kostore_LIB_SRCS |
493 |
- StoreDebug.cpp |
494 |
- KoNetAccess.cpp # temporary while porting |
495 |
- ) |
496 |
-+if( Qca-qt5_FOUND ) |
497 |
-+ set(kostore_LIB_SRCS ${kostore_LIB_SRCS} |
498 |
-+ KoEncryptedStore.cpp |
499 |
-+ KoEncryptionChecker.cpp |
500 |
-+ ) |
501 |
-+endif() |
502 |
- |
503 |
- add_library(planstore SHARED ${kostore_LIB_SRCS}) |
504 |
- generate_export_header(planstore BASE_NAME kostore) |
505 |
-@@ -35,12 +35,11 @@ target_link_libraries(planstore |
506 |
- PRIVATE |
507 |
- Qt5::Gui |
508 |
- KF5::Archive |
509 |
-- KF5::Wallet |
510 |
- KF5::KIOWidgets |
511 |
- KF5::I18n |
512 |
- ) |
513 |
- if( Qca-qt5_FOUND ) |
514 |
-- target_link_libraries(planstore PRIVATE qca-qt5) |
515 |
-+ target_link_libraries(planstore PRIVATE qca-qt5 KF5::Wallet) |
516 |
- endif() |
517 |
- |
518 |
- set_target_properties(planstore PROPERTIES |
519 |
-diff --git a/src/libs/widgets/KoDocumentInfoDlg.cpp b/src/libs/widgets/KoDocumentInfoDlg.cpp |
520 |
-index 1615a61..55e2c32 100644 |
521 |
---- a/src/libs/widgets/KoDocumentInfoDlg.cpp |
522 |
-+++ b/src/libs/widgets/KoDocumentInfoDlg.cpp |
523 |
-@@ -26,7 +26,9 @@ |
524 |
- #include "KoDocumentInfo.h" |
525 |
- #include "KoDocumentBase.h" |
526 |
- #include "KoGlobal.h" |
527 |
-+#ifdef QCA2 |
528 |
- #include <KoEncryptionChecker.h> |
529 |
-+#endif |
530 |
- #include "KoPageWidgetItem.h" |
531 |
- //#include <KoDocumentRdfBase.h> |
532 |
- #include <KoIcon.h> |
533 |
-@@ -105,12 +107,16 @@ KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo) |
534 |
- d->aboutUi = new Ui::KoDocumentInfoAboutWidget(); |
535 |
- QWidget *infodlg = new QWidget(); |
536 |
- d->aboutUi->setupUi(infodlg); |
537 |
-+#ifdef QCA2 |
538 |
- if (!KoEncryptionChecker::isEncryptionSupported()) { |
539 |
-+#endif |
540 |
- d->aboutUi->lblEncryptedDesc->setVisible(false); |
541 |
- d->aboutUi->lblEncrypted->setVisible(false); |
542 |
- d->aboutUi->pbEncrypt->setVisible(false); |
543 |
- d->aboutUi->lblEncryptedPic->setVisible(false); |
544 |
-+#ifdef QCA2 |
545 |
- } |
546 |
-+#endif |
547 |
- d->aboutUi->cbLanguage->addItems(KoGlobal::listOfLanguages()); |
548 |
- d->aboutUi->cbLanguage->setCurrentIndex(-1); |
549 |
- |
550 |
--- |
551 |
-2.20.1 |
552 |
- |
553 |
|
554 |
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch b/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch |
555 |
deleted file mode 100644 |
556 |
index 584d14e447e..00000000000 |
557 |
--- a/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch |
558 |
+++ /dev/null |
559 |
@@ -1,124 +0,0 @@ |
560 |
-From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001 |
561 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
562 |
-Date: Sun, 18 Mar 2018 11:56:57 +0100 |
563 |
-Subject: [PATCH] Fix build with Qt 5.11 (missing headers) |
564 |
- |
565 |
-Reviewers: #calligra:_3.0 |
566 |
- |
567 |
-Tags: #calligra:_3.0 |
568 |
- |
569 |
-Differential Revision: https://phabricator.kde.org/D11454 |
570 |
---- |
571 |
- src/kptview.h | 1 + |
572 |
- src/kptviewlist.cpp | 1 + |
573 |
- src/libs/ui/kptaccountseditor.cpp | 1 + |
574 |
- src/libs/ui/kptdocumentspanel.h | 1 + |
575 |
- src/libs/ui/kptitemviewsettup.cpp | 2 +- |
576 |
- src/libs/ui/kpttaskeditor.cpp | 1 + |
577 |
- src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 + |
578 |
- src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++ |
579 |
- 15 files changed, 18 insertions(+), 1 deletion(-) |
580 |
- |
581 |
-diff --git a/src/kptview.h b/src/kptview.h |
582 |
-index 44d11935e71..a98e55342db 100644 |
583 |
---- a/src/kptview.h |
584 |
-+++ b/src/kptview.h |
585 |
-@@ -28,6 +28,7 @@ |
586 |
- #include "kptcontext.h" |
587 |
- #include "kptviewbase.h" |
588 |
- |
589 |
-+#include <QActionGroup> |
590 |
- #include <QDockWidget> |
591 |
- #include <QMap> |
592 |
- |
593 |
-diff --git a/src/kptviewlist.cpp b/src/kptviewlist.cpp |
594 |
-index f34e702e055..0e6db7b2ffe 100644 |
595 |
---- a/src/kptviewlist.cpp |
596 |
-+++ b/src/kptviewlist.cpp |
597 |
-@@ -25,6 +25,7 @@ |
598 |
- #include <QStyle> |
599 |
- #include <QBrush> |
600 |
- #include <QContextMenuEvent> |
601 |
-+#include <QHeaderView> |
602 |
- #include <QMenu> |
603 |
- |
604 |
- #include <kmessagebox.h> |
605 |
-diff --git a/src/libs/ui/kptaccountseditor.cpp b/src/libs/ui/kptaccountseditor.cpp |
606 |
-index 7991fafd779..54e3a87c94f 100644 |
607 |
---- a/src/libs/ui/kptaccountseditor.cpp |
608 |
-+++ b/src/libs/ui/kptaccountseditor.cpp |
609 |
-@@ -40,6 +40,7 @@ |
610 |
- #include <QContextMenuEvent> |
611 |
- #include <QMenu> |
612 |
- #include <QAction> |
613 |
-+#include <QHeaderView> |
614 |
- |
615 |
- #include <KLocalizedString> |
616 |
- #include <kactioncollection.h> |
617 |
-diff --git a/src/libs/ui/kptdocumentspanel.h b/src/libs/ui/kptdocumentspanel.h |
618 |
-index 00ea3af80b2..491cb1ebb86 100644 |
619 |
---- a/src/libs/ui/kptdocumentspanel.h |
620 |
-+++ b/src/libs/ui/kptdocumentspanel.h |
621 |
-@@ -26,6 +26,7 @@ |
622 |
- |
623 |
- #include "kptdocuments.h" |
624 |
- |
625 |
-+#include <QModelIndexList> |
626 |
- #include <QWidget> |
627 |
- #include <kundo2qstack.h> |
628 |
- |
629 |
-diff --git a/src/libs/ui/kptitemviewsettup.cpp b/src/libs/ui/kptitemviewsettup.cpp |
630 |
-index d1c3b1fc157..7c97a070b9a 100644 |
631 |
---- a/src/libs/ui/kptitemviewsettup.cpp |
632 |
-+++ b/src/libs/ui/kptitemviewsettup.cpp |
633 |
-@@ -25,9 +25,9 @@ |
634 |
- |
635 |
- #include "KoPageLayoutWidget.h" |
636 |
- |
637 |
-+#include <QHeaderView> |
638 |
- #include <QPushButton> |
639 |
- |
640 |
-- |
641 |
- namespace KPlato |
642 |
- { |
643 |
- |
644 |
-diff --git a/src/libs/ui/kpttaskeditor.cpp b/src/libs/ui/kpttaskeditor.cpp |
645 |
-index 21546118d33..91db5acbb18 100644 |
646 |
---- a/src/libs/ui/kpttaskeditor.cpp |
647 |
-+++ b/src/libs/ui/kpttaskeditor.cpp |
648 |
-@@ -45,6 +45,7 @@ |
649 |
- #include <QVBoxLayout> |
650 |
- #include <QDragMoveEvent> |
651 |
- #include <QAction> |
652 |
-+#include <QHeaderView> |
653 |
- #include <QMenu> |
654 |
- |
655 |
- #include <kactionmenu.h> |
656 |
-diff --git a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp |
657 |
-index 344ebc2b599..9146f06ab8c 100644 |
658 |
---- a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp |
659 |
-+++ b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp |
660 |
-@@ -31,6 +31,7 @@ |
661 |
- #include <KFile> |
662 |
- |
663 |
- #include <QAction> |
664 |
-+#include <QHeaderView> |
665 |
- #include <QTreeView> |
666 |
- #include <QStandardItemModel> |
667 |
- #include <QModelIndex> |
668 |
-diff --git a/src/libs/widgets/KoPageLayoutWidget.cpp b/src/libs/widgets/KoPageLayoutWidget.cpp |
669 |
-index c9e17b748a9..b67e9848807 100644 |
670 |
---- a/src/libs/widgets/KoPageLayoutWidget.cpp |
671 |
-+++ b/src/libs/widgets/KoPageLayoutWidget.cpp |
672 |
-@@ -23,6 +23,8 @@ |
673 |
- |
674 |
- #include <KoUnit.h> |
675 |
- |
676 |
-+#include <QButtonGroup> |
677 |
-+ |
678 |
- class Q_DECL_HIDDEN KoPageLayoutWidget::Private |
679 |
- { |
680 |
- public: |
681 |
--- |
682 |
-2.16.2 |
683 |
- |
684 |
|
685 |
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch b/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch |
686 |
deleted file mode 100644 |
687 |
index 707b6c8cdd5..00000000000 |
688 |
--- a/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch |
689 |
+++ /dev/null |
690 |
@@ -1,57 +0,0 @@ |
691 |
-From 5924e3ad82b5dfc95acf9f6751946d5f086d9ce7 Mon Sep 17 00:00:00 2001 |
692 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
693 |
-Date: Tue, 1 Jan 2019 20:13:57 +0100 |
694 |
-Subject: Drop unused dependencies |
695 |
- |
696 |
-Test Plan: Built fine with deps removed. |
697 |
- |
698 |
-Reviewers: #calligra:_3.0, danders |
699 |
- |
700 |
-Reviewed By: #calligra:_3.0, danders |
701 |
- |
702 |
-Subscribers: danders |
703 |
- |
704 |
-Differential Revision: https://phabricator.kde.org/D17903 |
705 |
---- |
706 |
- CMakeLists.txt | 14 ++------------ |
707 |
- 1 file changed, 2 insertions(+), 12 deletions(-) |
708 |
- |
709 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
710 |
-index 3cb4b63..a6a3c79 100644 |
711 |
---- a/CMakeLists.txt |
712 |
-+++ b/CMakeLists.txt |
713 |
-@@ -121,7 +121,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED |
714 |
- IconThemes |
715 |
- ItemViews |
716 |
- JobWidgets |
717 |
-- KCMUtils |
718 |
- KIO |
719 |
- Notifications |
720 |
- # NotifyConfig |
721 |
-@@ -169,22 +168,13 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED |
722 |
- COMPONENTS |
723 |
- Core |
724 |
- Gui |
725 |
-- Network |
726 |
- PrintSupport |
727 |
-- Svg |
728 |
- Test |
729 |
- Widgets |
730 |
- Xml |
731 |
- ) |
732 |
-- find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET |
733 |
-- COMPONENTS |
734 |
-- DBus |
735 |
-- OpenGL |
736 |
-- # Quick |
737 |
-- # Sql |
738 |
-- # WebKit |
739 |
-- # WebKitWidgets |
740 |
-- ) |
741 |
-+ find_package(Qt5DBus ${REQUIRED_QT_VERSION} QUIET) |
742 |
-+ |
743 |
- # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call |
744 |
- # Including it in a collected find_package(Qt5 ...) call can lead to a fatal not-found error: |
745 |
- # * Qt5 (required version >= 5.3.0) |
746 |
--- |
747 |
-cgit v1.1 |
748 |
|
749 |
diff --git a/app-office/calligraplan/metadata.xml b/app-office/calligraplan/metadata.xml |
750 |
index a7529db60e6..192aa1d0ef0 100644 |
751 |
--- a/app-office/calligraplan/metadata.xml |
752 |
+++ b/app-office/calligraplan/metadata.xml |
753 |
@@ -13,6 +13,5 @@ |
754 |
<flag name="activities">Enable kactivities support</flag> |
755 |
<flag name="holidays">Enable <pkg>kde-frameworks/kholidays</pkg> integration</flag> |
756 |
<flag name="kwallet">Enable access to encrypted OpenDocument files with <pkg>kde-frameworks/kwallet</pkg> storage</flag> |
757 |
- <flag name="pim">Enable support for KDE PIM resources integration</flag> |
758 |
</use> |
759 |
</pkgmetadata> |