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/files/
Date: Sat, 09 Feb 2019 09:52:25
Message-Id: 1549705920.e872c7f40b402f97f45da4f99a756284025ce3df.asturm@gentoo
1 commit: e872c7f40b402f97f45da4f99a756284025ce3df
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Feb 8 15:59:49 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 9 09:52:00 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e872c7f4
7
8 app-office/calligra: remove unused patch
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/11009
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 .../files/calligra-3.1.0-plan-qt-5.11.patch | 124 ---------------------
15 1 file changed, 124 deletions(-)
16
17 diff --git a/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch
18 deleted file mode 100644
19 index d63f5ccbe87..00000000000
20 --- a/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch
21 +++ /dev/null
22 @@ -1,124 +0,0 @@
23 -From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001
24 -From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
25 -Date: Sun, 18 Mar 2018 11:56:57 +0100
26 -Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
27 -
28 -Reviewers: #calligra:_3.0
29 -
30 -Tags: #calligra:_3.0
31 -
32 -Differential Revision: https://phabricator.kde.org/D11454
33 ----
34 - plan/src/kptview.h | 1 +
35 - plan/src/kptviewlist.cpp | 1 +
36 - plan/src/libs/ui/kptaccountseditor.cpp | 1 +
37 - plan/src/libs/ui/kptdocumentspanel.h | 1 +
38 - plan/src/libs/ui/kptitemviewsettup.cpp | 2 +-
39 - plan/src/libs/ui/kpttaskeditor.cpp | 1 +
40 - plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
41 - plan/src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++
42 - 15 files changed, 18 insertions(+), 1 deletion(-)
43 -
44 -diff --git a/plan/src/kptview.h b/plan/src/kptview.h
45 -index 44d11935e71..a98e55342db 100644
46 ---- a/plan/src/kptview.h
47 -+++ b/plan/src/kptview.h
48 -@@ -28,6 +28,7 @@
49 - #include "kptcontext.h"
50 - #include "kptviewbase.h"
51 -
52 -+#include <QActionGroup>
53 - #include <QDockWidget>
54 - #include <QMap>
55 -
56 -diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp
57 -index f34e702e055..0e6db7b2ffe 100644
58 ---- a/plan/src/kptviewlist.cpp
59 -+++ b/plan/src/kptviewlist.cpp
60 -@@ -25,6 +25,7 @@
61 - #include <QStyle>
62 - #include <QBrush>
63 - #include <QContextMenuEvent>
64 -+#include <QHeaderView>
65 - #include <QMenu>
66 -
67 - #include <kmessagebox.h>
68 -diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp
69 -index 7991fafd779..54e3a87c94f 100644
70 ---- a/plan/src/libs/ui/kptaccountseditor.cpp
71 -+++ b/plan/src/libs/ui/kptaccountseditor.cpp
72 -@@ -40,6 +40,7 @@
73 - #include <QContextMenuEvent>
74 - #include <QMenu>
75 - #include <QAction>
76 -+#include <QHeaderView>
77 -
78 - #include <KLocalizedString>
79 - #include <kactioncollection.h>
80 -diff --git a/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h
81 -index 00ea3af80b2..491cb1ebb86 100644
82 ---- a/plan/src/libs/ui/kptdocumentspanel.h
83 -+++ b/plan/src/libs/ui/kptdocumentspanel.h
84 -@@ -26,6 +26,7 @@
85 -
86 - #include "kptdocuments.h"
87 -
88 -+#include <QModelIndexList>
89 - #include <QWidget>
90 - #include <kundo2qstack.h>
91 -
92 -diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp
93 -index d1c3b1fc157..7c97a070b9a 100644
94 ---- a/plan/src/libs/ui/kptitemviewsettup.cpp
95 -+++ b/plan/src/libs/ui/kptitemviewsettup.cpp
96 -@@ -25,9 +25,9 @@
97 -
98 - #include "KoPageLayoutWidget.h"
99 -
100 -+#include <QHeaderView>
101 - #include <QPushButton>
102 -
103 --
104 - namespace KPlato
105 - {
106 -
107 -diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp
108 -index 21546118d33..91db5acbb18 100644
109 ---- a/plan/src/libs/ui/kpttaskeditor.cpp
110 -+++ b/plan/src/libs/ui/kpttaskeditor.cpp
111 -@@ -45,6 +45,7 @@
112 - #include <QVBoxLayout>
113 - #include <QDragMoveEvent>
114 - #include <QAction>
115 -+#include <QHeaderView>
116 - #include <QMenu>
117 -
118 - #include <kactionmenu.h>
119 -diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
120 -index 344ebc2b599..9146f06ab8c 100644
121 ---- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
122 -+++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
123 -@@ -31,6 +31,7 @@
124 - #include <KFile>
125 -
126 - #include <QAction>
127 -+#include <QHeaderView>
128 - #include <QTreeView>
129 - #include <QStandardItemModel>
130 - #include <QModelIndex>
131 -diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
132 -index c9e17b748a9..b67e9848807 100644
133 ---- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp
134 -+++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
135 -@@ -23,6 +23,8 @@
136 -
137 - #include <KoUnit.h>
138 -
139 -+#include <QButtonGroup>
140 -+
141 - class Q_DECL_HIDDEN KoPageLayoutWidget::Private
142 - {
143 - public:
144 ---
145 -2.16.2
146 -