Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
Date: Sun, 11 Aug 2019 08:19:46
Message-Id: 1565511565.601b38ca8080c16e4adc418365d0dd76375b8dc4.asturm@gentoo
1 commit: 601b38ca8080c16e4adc418365d0dd76375b8dc4
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 11 07:24:55 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 11 08:19:25 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=601b38ca
7
8 app-office/calligra: Fix missing header with Frameworks 5.61
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 app-office/calligra/calligra-3.1.0-r3.ebuild | 1 +
14 .../files/calligra-3.1.0-missing-header.patch | 23 ++++++++++++++++++++++
15 2 files changed, 24 insertions(+)
16
17 diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild
18 index 81597b0d7d1..77136854363 100644
19 --- a/app-office/calligra/calligra-3.1.0-r3.ebuild
20 +++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
21 @@ -121,6 +121,7 @@ PATCHES=(
22 "${FILESDIR}"/${P}-poppler-0.69.patch
23 "${FILESDIR}"/${P}-poppler-0.71.patch
24 "${FILESDIR}"/${P}-no-webkit.patch
25 + "${FILESDIR}"/${P}-missing-header.patch
26 )
27
28 pkg_pretend() {
29
30 diff --git a/app-office/calligra/files/calligra-3.1.0-missing-header.patch b/app-office/calligra/files/calligra-3.1.0-missing-header.patch
31 new file mode 100644
32 index 00000000000..f15c3787172
33 --- /dev/null
34 +++ b/app-office/calligra/files/calligra-3.1.0-missing-header.patch
35 @@ -0,0 +1,23 @@
36 +From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001
37 +From: David Faure <faure@×××.org>
38 +Date: Tue, 23 Jul 2019 13:02:34 +0200
39 +Subject: Fix compilation with Qt 5.13 (missing include)
40 +
41 +---
42 + sheets/plugins/calendar/CalendarToolWidget.cpp | 1 +
43 + 1 file changed, 1 insertion(+)
44 +
45 +diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp
46 +index b10b230..0c5eeb6 100644
47 +--- a/sheets/plugins/calendar/CalendarToolWidget.cpp
48 ++++ b/sheets/plugins/calendar/CalendarToolWidget.cpp
49 +@@ -30,6 +30,7 @@
50 + #include <kdatepicker.h>
51 +
52 + #include <QPushButton>
53 ++#include <QDate>
54 +
55 + namespace Calligra
56 + {
57 +--
58 +cgit v1.1