1 |
commit: 11ee88aed98350f2c08ed36c1daa802182c10a38 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 24 06:42:17 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 24 06:42:17 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ee88ae |
7 |
|
8 |
app-office/calligra: Fix build w/o plan |
9 |
|
10 |
Closes: https://bugs.gentoo.org/651318 |
11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
12 |
|
13 |
app-office/calligra/calligra-3.1.0-r2.ebuild | 2 + |
14 |
....11.patch => calligra-3.1.0-plan-qt-5.11.patch} | 93 ------------------ |
15 |
.../calligra/files/calligra-3.1.0-qt-5.11.patch | 108 --------------------- |
16 |
3 files changed, 2 insertions(+), 201 deletions(-) |
17 |
|
18 |
diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild |
19 |
index 2084d5f44db..b1da5f43076 100644 |
20 |
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild |
21 |
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild |
22 |
@@ -159,6 +159,8 @@ src_prepare() { |
23 |
sed -e "/add_subdirectory(plan)/s/#//" \ |
24 |
-e "/^calligra_disable_product(APP_PLAN/s/^/#/" \ |
25 |
-i CMakeLists.txt || die |
26 |
+ |
27 |
+ eapply "${FILESDIR}"/${P}-plan-qt-5.11.patch |
28 |
fi |
29 |
kde5_src_prepare |
30 |
|
31 |
|
32 |
diff --git a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch |
33 |
similarity index 54% |
34 |
copy from app-office/calligra/files/calligra-3.1.0-qt-5.11.patch |
35 |
copy to app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch |
36 |
index 09236c41de0..d63f5ccbe87 100644 |
37 |
--- a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch |
38 |
+++ b/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch |
39 |
@@ -9,8 +9,6 @@ Tags: #calligra:_3.0 |
40 |
|
41 |
Differential Revision: https://phabricator.kde.org/D11454 |
42 |
--- |
43 |
- libs/widgets/KoCsvImportDialog.cpp | 1 + |
44 |
- libs/widgets/KoPageLayoutWidget.cpp | 2 ++ |
45 |
plan/src/kptview.h | 1 + |
46 |
plan/src/kptviewlist.cpp | 1 + |
47 |
plan/src/libs/ui/kptaccountseditor.cpp | 1 + |
48 |
@@ -19,38 +17,8 @@ Differential Revision: https://phabricator.kde.org/D11454 |
49 |
plan/src/libs/ui/kpttaskeditor.cpp | 1 + |
50 |
plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 + |
51 |
plan/src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++ |
52 |
- plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 + |
53 |
- plugins/formulashape/FormulaToolWidget.cpp | 1 + |
54 |
- sheets/dialogs/LayoutDialog.cpp | 1 + |
55 |
- words/part/dialogs/KWAnchoringProperties.cpp | 1 + |
56 |
- words/part/dialogs/KWRunAroundProperties.cpp | 2 ++ |
57 |
15 files changed, 18 insertions(+), 1 deletion(-) |
58 |
|
59 |
-diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp |
60 |
-index 0ffdcf62a70..cdca006dc62 100644 |
61 |
---- a/libs/widgets/KoCsvImportDialog.cpp |
62 |
-+++ b/libs/widgets/KoCsvImportDialog.cpp |
63 |
-@@ -21,6 +21,7 @@ |
64 |
- #include "KoCsvImportDialog.h" |
65 |
- |
66 |
- // Qt |
67 |
-+#include <QButtonGroup> |
68 |
- #include <QTextCodec> |
69 |
- #include <QTextStream> |
70 |
- |
71 |
-diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp |
72 |
-index f91555ca262..a3816f96d8a 100644 |
73 |
---- a/libs/widgets/KoPageLayoutWidget.cpp |
74 |
-+++ b/libs/widgets/KoPageLayoutWidget.cpp |
75 |
-@@ -23,6 +23,8 @@ |
76 |
- |
77 |
- #include <KoUnit.h> |
78 |
- |
79 |
-+#include <QButtonGroup> |
80 |
-+ |
81 |
- class Q_DECL_HIDDEN KoPageLayoutWidget::Private |
82 |
- { |
83 |
- public: |
84 |
diff --git a/plan/src/kptview.h b/plan/src/kptview.h |
85 |
index 44d11935e71..a98e55342db 100644 |
86 |
--- a/plan/src/kptview.h |
87 |
@@ -151,67 +119,6 @@ index c9e17b748a9..b67e9848807 100644 |
88 |
class Q_DECL_HIDDEN KoPageLayoutWidget::Private |
89 |
{ |
90 |
public: |
91 |
-diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp |
92 |
-index c0d5136f09e..d2a772e83c2 100644 |
93 |
---- a/plugins/chartshape/dialogs/TableEditorDialog.cpp |
94 |
-+++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp |
95 |
-@@ -24,6 +24,7 @@ |
96 |
- |
97 |
- // Qt |
98 |
- #include <QAbstractItemModel> |
99 |
-+#include <QAction> |
100 |
- |
101 |
- // Calligra |
102 |
- #include <KoIcon.h> |
103 |
-diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp |
104 |
-index ed109192cc5..8f521779617 100644 |
105 |
---- a/plugins/formulashape/FormulaToolWidget.cpp |
106 |
-+++ b/plugins/formulashape/FormulaToolWidget.cpp |
107 |
-@@ -30,6 +30,7 @@ |
108 |
- #include <QWidgetAction> |
109 |
- #include <QTableWidget> |
110 |
- #include <QAction> |
111 |
-+#include <QHeaderView> |
112 |
- #include <QMenu> |
113 |
- |
114 |
- FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) |
115 |
-diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp |
116 |
-index a0a9832ddfc..7d7db53823b 100644 |
117 |
---- a/sheets/dialogs/LayoutDialog.cpp |
118 |
-+++ b/sheets/dialogs/LayoutDialog.cpp |
119 |
-@@ -36,6 +36,7 @@ |
120 |
- #include <math.h> |
121 |
- |
122 |
- #include <QIntValidator> |
123 |
-+#include <QButtonGroup> |
124 |
- #include <QCheckBox> |
125 |
- #include <QFrame> |
126 |
- #include <QLabel> |
127 |
-diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp |
128 |
-index d64208cbdb6..bfddb3a03f5 100644 |
129 |
---- a/words/part/dialogs/KWAnchoringProperties.cpp |
130 |
-+++ b/words/part/dialogs/KWAnchoringProperties.cpp |
131 |
-@@ -35,6 +35,7 @@ |
132 |
- |
133 |
- #include <kundo2command.h> |
134 |
- |
135 |
-+#include <QButtonGroup> |
136 |
- #include <QComboBox> |
137 |
- |
138 |
- const int KWAnchoringProperties::vertRels[4][20] = { |
139 |
-diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp |
140 |
-index e38599a06d7..7e8b2d51ef9 100644 |
141 |
---- a/words/part/dialogs/KWRunAroundProperties.cpp |
142 |
-+++ b/words/part/dialogs/KWRunAroundProperties.cpp |
143 |
-@@ -28,6 +28,8 @@ |
144 |
- |
145 |
- #include <kundo2command.h> |
146 |
- |
147 |
-+#include <QButtonGroup> |
148 |
-+ |
149 |
- KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) |
150 |
- : m_state(state) |
151 |
- { |
152 |
-- |
153 |
2.16.2 |
154 |
|
155 |
|
156 |
diff --git a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch |
157 |
index 09236c41de0..bdbe4b6e855 100644 |
158 |
--- a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch |
159 |
+++ b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch |
160 |
@@ -11,14 +11,6 @@ Differential Revision: https://phabricator.kde.org/D11454 |
161 |
--- |
162 |
libs/widgets/KoCsvImportDialog.cpp | 1 + |
163 |
libs/widgets/KoPageLayoutWidget.cpp | 2 ++ |
164 |
- plan/src/kptview.h | 1 + |
165 |
- plan/src/kptviewlist.cpp | 1 + |
166 |
- plan/src/libs/ui/kptaccountseditor.cpp | 1 + |
167 |
- plan/src/libs/ui/kptdocumentspanel.h | 1 + |
168 |
- plan/src/libs/ui/kptitemviewsettup.cpp | 2 +- |
169 |
- plan/src/libs/ui/kpttaskeditor.cpp | 1 + |
170 |
- plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 + |
171 |
- plan/src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++ |
172 |
plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 + |
173 |
plugins/formulashape/FormulaToolWidget.cpp | 1 + |
174 |
sheets/dialogs/LayoutDialog.cpp | 1 + |
175 |
@@ -46,106 +38,6 @@ index f91555ca262..a3816f96d8a 100644 |
176 |
|
177 |
#include <KoUnit.h> |
178 |
|
179 |
-+#include <QButtonGroup> |
180 |
-+ |
181 |
- class Q_DECL_HIDDEN KoPageLayoutWidget::Private |
182 |
- { |
183 |
- public: |
184 |
-diff --git a/plan/src/kptview.h b/plan/src/kptview.h |
185 |
-index 44d11935e71..a98e55342db 100644 |
186 |
---- a/plan/src/kptview.h |
187 |
-+++ b/plan/src/kptview.h |
188 |
-@@ -28,6 +28,7 @@ |
189 |
- #include "kptcontext.h" |
190 |
- #include "kptviewbase.h" |
191 |
- |
192 |
-+#include <QActionGroup> |
193 |
- #include <QDockWidget> |
194 |
- #include <QMap> |
195 |
- |
196 |
-diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp |
197 |
-index f34e702e055..0e6db7b2ffe 100644 |
198 |
---- a/plan/src/kptviewlist.cpp |
199 |
-+++ b/plan/src/kptviewlist.cpp |
200 |
-@@ -25,6 +25,7 @@ |
201 |
- #include <QStyle> |
202 |
- #include <QBrush> |
203 |
- #include <QContextMenuEvent> |
204 |
-+#include <QHeaderView> |
205 |
- #include <QMenu> |
206 |
- |
207 |
- #include <kmessagebox.h> |
208 |
-diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp |
209 |
-index 7991fafd779..54e3a87c94f 100644 |
210 |
---- a/plan/src/libs/ui/kptaccountseditor.cpp |
211 |
-+++ b/plan/src/libs/ui/kptaccountseditor.cpp |
212 |
-@@ -40,6 +40,7 @@ |
213 |
- #include <QContextMenuEvent> |
214 |
- #include <QMenu> |
215 |
- #include <QAction> |
216 |
-+#include <QHeaderView> |
217 |
- |
218 |
- #include <KLocalizedString> |
219 |
- #include <kactioncollection.h> |
220 |
-diff --git a/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h |
221 |
-index 00ea3af80b2..491cb1ebb86 100644 |
222 |
---- a/plan/src/libs/ui/kptdocumentspanel.h |
223 |
-+++ b/plan/src/libs/ui/kptdocumentspanel.h |
224 |
-@@ -26,6 +26,7 @@ |
225 |
- |
226 |
- #include "kptdocuments.h" |
227 |
- |
228 |
-+#include <QModelIndexList> |
229 |
- #include <QWidget> |
230 |
- #include <kundo2qstack.h> |
231 |
- |
232 |
-diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp |
233 |
-index d1c3b1fc157..7c97a070b9a 100644 |
234 |
---- a/plan/src/libs/ui/kptitemviewsettup.cpp |
235 |
-+++ b/plan/src/libs/ui/kptitemviewsettup.cpp |
236 |
-@@ -25,9 +25,9 @@ |
237 |
- |
238 |
- #include "KoPageLayoutWidget.h" |
239 |
- |
240 |
-+#include <QHeaderView> |
241 |
- #include <QPushButton> |
242 |
- |
243 |
-- |
244 |
- namespace KPlato |
245 |
- { |
246 |
- |
247 |
-diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp |
248 |
-index 21546118d33..91db5acbb18 100644 |
249 |
---- a/plan/src/libs/ui/kpttaskeditor.cpp |
250 |
-+++ b/plan/src/libs/ui/kpttaskeditor.cpp |
251 |
-@@ -45,6 +45,7 @@ |
252 |
- #include <QVBoxLayout> |
253 |
- #include <QDragMoveEvent> |
254 |
- #include <QAction> |
255 |
-+#include <QHeaderView> |
256 |
- #include <QMenu> |
257 |
- |
258 |
- #include <kactionmenu.h> |
259 |
-diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp |
260 |
-index 344ebc2b599..9146f06ab8c 100644 |
261 |
---- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp |
262 |
-+++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp |
263 |
-@@ -31,6 +31,7 @@ |
264 |
- #include <KFile> |
265 |
- |
266 |
- #include <QAction> |
267 |
-+#include <QHeaderView> |
268 |
- #include <QTreeView> |
269 |
- #include <QStandardItemModel> |
270 |
- #include <QModelIndex> |
271 |
-diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp |
272 |
-index c9e17b748a9..b67e9848807 100644 |
273 |
---- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp |
274 |
-+++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp |
275 |
-@@ -23,6 +23,8 @@ |
276 |
- |
277 |
- #include <KoUnit.h> |
278 |
- |
279 |
+#include <QButtonGroup> |
280 |
+ |
281 |
class Q_DECL_HIDDEN KoPageLayoutWidget::Private |