1 |
commit: 5957a326f9054d0684726f42d8a1f397cab41c1e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 18 07:19:02 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 18 07:20:07 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5957a326 |
7 |
|
8 |
app-misc/qlcplus: Fix build with Qt 5.11 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/660456 |
11 |
Package-Manager: Portage-2.3.47, Repoman-2.3.10 |
12 |
|
13 |
.../qlcplus/files/qlcplus-4.11.1-qt-5.11.patch | 243 +++++++++++++++++++++ |
14 |
app-misc/qlcplus/qlcplus-4.11.1.ebuild | 4 +- |
15 |
2 files changed, 246 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/app-misc/qlcplus/files/qlcplus-4.11.1-qt-5.11.patch b/app-misc/qlcplus/files/qlcplus-4.11.1-qt-5.11.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..1279148283b |
20 |
--- /dev/null |
21 |
+++ b/app-misc/qlcplus/files/qlcplus-4.11.1-qt-5.11.patch |
22 |
@@ -0,0 +1,243 @@ |
23 |
+From f8be095c95831ae6ffc8426a94901197c0dacc38 Mon Sep 17 00:00:00 2001 |
24 |
+From: Jano Svitok <jan.svitok@×××××.com> |
25 |
+Date: Mon, 9 Apr 2018 23:54:50 +0200 |
26 |
+Subject: [PATCH] Fix compilation with QT 5.11.0 beta2 |
27 |
+ |
28 |
+--- |
29 |
+ fixtureeditor/capabilitywizard.cpp | 1 + |
30 |
+ fixtureeditor/editchannel.cpp | 1 + |
31 |
+ fixtureeditor/edithead.cpp | 1 + |
32 |
+ fixtureeditor/editmode.cpp | 1 + |
33 |
+ ui/src/aboutbox.cpp | 1 + |
34 |
+ ui/src/addfixture.cpp | 1 + |
35 |
+ ui/src/chasereditor.cpp | 1 + |
36 |
+ ui/src/fixtureselection.cpp | 1 + |
37 |
+ ui/src/functionwizard.cpp | 1 + |
38 |
+ ui/src/inputchanneleditor.cpp | 1 + |
39 |
+ ui/src/selectinputchannel.cpp | 1 + |
40 |
+ ui/src/virtualconsole/addvcbuttonmatrix.cpp | 1 + |
41 |
+ ui/src/virtualconsole/addvcslidermatrix.cpp | 1 + |
42 |
+ ui/src/virtualconsole/vcbuttonproperties.cpp | 1 + |
43 |
+ ui/src/virtualconsole/vccuelistproperties.cpp | 2 ++ |
44 |
+ ui/src/virtualconsole/vcpropertieseditor.cpp | 1 + |
45 |
+ ui/src/virtualconsole/vcsliderproperties.cpp | 1 + |
46 |
+ ui/src/virtualconsole/vcxypadproperties.cpp | 1 + |
47 |
+ 18 files changed, 19 insertions(+) |
48 |
+ |
49 |
+diff --git a/fixtureeditor/capabilitywizard.cpp b/fixtureeditor/capabilitywizard.cpp |
50 |
+index d77c30fe1..ddb4c5b26 100644 |
51 |
+--- a/fixtureeditor/capabilitywizard.cpp |
52 |
++++ b/fixtureeditor/capabilitywizard.cpp |
53 |
+@@ -21,6 +21,7 @@ |
54 |
+ #include <QTextEdit> |
55 |
+ #include <QSpinBox> |
56 |
+ #include <QDialog> |
57 |
++#include <QAction> |
58 |
+ |
59 |
+ #include "capabilitywizard.h" |
60 |
+ #include "qlccapability.h" |
61 |
+diff --git a/fixtureeditor/editchannel.cpp b/fixtureeditor/editchannel.cpp |
62 |
+index c44097783..9278c31b6 100644 |
63 |
+--- a/fixtureeditor/editchannel.cpp |
64 |
++++ b/fixtureeditor/editchannel.cpp |
65 |
+@@ -32,6 +32,7 @@ |
66 |
+ #include <QPainter> |
67 |
+ #include <QPoint> |
68 |
+ #include <QSize> |
69 |
++#include <QAction> |
70 |
+ |
71 |
+ #include "qlccapability.h" |
72 |
+ #include "qlcconfig.h" |
73 |
+diff --git a/fixtureeditor/edithead.cpp b/fixtureeditor/edithead.cpp |
74 |
+index a95ecf726..68025b70d 100644 |
75 |
+--- a/fixtureeditor/edithead.cpp |
76 |
++++ b/fixtureeditor/edithead.cpp |
77 |
+@@ -20,6 +20,7 @@ |
78 |
+ #include <QTreeWidgetItem> |
79 |
+ #include <QTreeWidget> |
80 |
+ #include <QDebug> |
81 |
++#include <QAction> |
82 |
+ |
83 |
+ #include "qlcfixturehead.h" |
84 |
+ #include "qlcfixturemode.h" |
85 |
+diff --git a/fixtureeditor/editmode.cpp b/fixtureeditor/editmode.cpp |
86 |
+index 440ab4956..5b8b1884f 100644 |
87 |
+--- a/fixtureeditor/editmode.cpp |
88 |
++++ b/fixtureeditor/editmode.cpp |
89 |
+@@ -30,6 +30,7 @@ |
90 |
+ #include <QPoint> |
91 |
+ #include <QDebug> |
92 |
+ #include <QSize> |
93 |
++#include <QAction> |
94 |
+ |
95 |
+ #include "addchannelsdialog.h" |
96 |
+ #include "qlcfixturemode.h" |
97 |
+diff --git a/ui/src/aboutbox.cpp b/ui/src/aboutbox.cpp |
98 |
+index 68ece2d54..9296e566b 100644 |
99 |
+--- a/ui/src/aboutbox.cpp |
100 |
++++ b/ui/src/aboutbox.cpp |
101 |
+@@ -22,6 +22,7 @@ |
102 |
+ #include <QTimer> |
103 |
+ #include <QDesktopServices> |
104 |
+ #include <QUrl> |
105 |
++#include <QAction> |
106 |
+ |
107 |
+ #include "qlcconfig.h" |
108 |
+ #include "aboutbox.h" |
109 |
+diff --git a/ui/src/addfixture.cpp b/ui/src/addfixture.cpp |
110 |
+index dad12f4e6..ae6bc0efc 100644 |
111 |
+--- a/ui/src/addfixture.cpp |
112 |
++++ b/ui/src/addfixture.cpp |
113 |
+@@ -30,6 +30,7 @@ |
114 |
+ #include <QSpinBox> |
115 |
+ #include <QLabel> |
116 |
+ #include <QDebug> |
117 |
++#include <QAction> |
118 |
+ |
119 |
+ #include "qlcfixturedefcache.h" |
120 |
+ #include "qlcfixturemode.h" |
121 |
+diff --git a/ui/src/chasereditor.cpp b/ui/src/chasereditor.cpp |
122 |
+index bd949dcf2..246b71606 100644 |
123 |
+--- a/ui/src/chasereditor.cpp |
124 |
++++ b/ui/src/chasereditor.cpp |
125 |
+@@ -27,6 +27,7 @@ |
126 |
+ #include <QSettings> |
127 |
+ #include <QDebug> |
128 |
+ #include <QUrl> |
129 |
++#include <QAction> |
130 |
+ |
131 |
+ #include "qlcfixturedef.h" |
132 |
+ #include "qlcmacros.h" |
133 |
+diff --git a/ui/src/fixtureselection.cpp b/ui/src/fixtureselection.cpp |
134 |
+index 0954a00a1..30851fa21 100644 |
135 |
+--- a/ui/src/fixtureselection.cpp |
136 |
++++ b/ui/src/fixtureselection.cpp |
137 |
+@@ -21,6 +21,7 @@ |
138 |
+ #include <QTreeWidget> |
139 |
+ #include <QHeaderView> |
140 |
+ #include <QLabel> |
141 |
++#include <QAction> |
142 |
+ |
143 |
+ #include "qlcfixturedef.h" |
144 |
+ |
145 |
+diff --git a/ui/src/functionwizard.cpp b/ui/src/functionwizard.cpp |
146 |
+index 00e7d5a4c..815b20e4c 100644 |
147 |
+--- a/ui/src/functionwizard.cpp |
148 |
++++ b/ui/src/functionwizard.cpp |
149 |
+@@ -21,6 +21,7 @@ |
150 |
+ #include <QString> |
151 |
+ #include <QDebug> |
152 |
+ #include <QHash> |
153 |
++#include <QAction> |
154 |
+ |
155 |
+ #include "palettegenerator.h" |
156 |
+ #include "fixtureselection.h" |
157 |
+diff --git a/ui/src/inputchanneleditor.cpp b/ui/src/inputchanneleditor.cpp |
158 |
+index 6ad638c1f..69b9ca2ae 100644 |
159 |
+--- a/ui/src/inputchanneleditor.cpp |
160 |
++++ b/ui/src/inputchanneleditor.cpp |
161 |
+@@ -21,6 +21,7 @@ |
162 |
+ #include <QComboBox> |
163 |
+ #include <QSpinBox> |
164 |
+ #include <QIcon> |
165 |
++#include <QAction> |
166 |
+ |
167 |
+ #include "qlcchannel.h" |
168 |
+ #include "qlcinputprofile.h" |
169 |
+diff --git a/ui/src/selectinputchannel.cpp b/ui/src/selectinputchannel.cpp |
170 |
+index c07c617fe..72006f2ca 100644 |
171 |
+--- a/ui/src/selectinputchannel.cpp |
172 |
++++ b/ui/src/selectinputchannel.cpp |
173 |
+@@ -21,6 +21,7 @@ |
174 |
+ #include <QTreeWidgetItem> |
175 |
+ #include <QTreeWidget> |
176 |
+ #include <QDebug> |
177 |
++#include <QAction> |
178 |
+ |
179 |
+ #include "selectinputchannel.h" |
180 |
+ #include "qlcinputchannel.h" |
181 |
+diff --git a/ui/src/virtualconsole/addvcbuttonmatrix.cpp b/ui/src/virtualconsole/addvcbuttonmatrix.cpp |
182 |
+index 7ad7160e8..09523bd04 100644 |
183 |
+--- a/ui/src/virtualconsole/addvcbuttonmatrix.cpp |
184 |
++++ b/ui/src/virtualconsole/addvcbuttonmatrix.cpp |
185 |
+@@ -19,6 +19,7 @@ |
186 |
+ |
187 |
+ #include <QSettings> |
188 |
+ #include <QDebug> |
189 |
++#include <QAction> |
190 |
+ |
191 |
+ #include "addvcbuttonmatrix.h" |
192 |
+ #include "functionselection.h" |
193 |
+diff --git a/ui/src/virtualconsole/addvcslidermatrix.cpp b/ui/src/virtualconsole/addvcslidermatrix.cpp |
194 |
+index 63aa9dcce..cd80b3fe3 100644 |
195 |
+--- a/ui/src/virtualconsole/addvcslidermatrix.cpp |
196 |
++++ b/ui/src/virtualconsole/addvcslidermatrix.cpp |
197 |
+@@ -19,6 +19,7 @@ |
198 |
+ |
199 |
+ #include <QSettings> |
200 |
+ #include <QSpinBox> |
201 |
++#include <QAction> |
202 |
+ |
203 |
+ #include "addvcslidermatrix.h" |
204 |
+ #include "vcpropertieseditor.h" |
205 |
+diff --git a/ui/src/virtualconsole/vcbuttonproperties.cpp b/ui/src/virtualconsole/vcbuttonproperties.cpp |
206 |
+index ef0bb24ee..8e6dbde72 100644 |
207 |
+--- a/ui/src/virtualconsole/vcbuttonproperties.cpp |
208 |
++++ b/ui/src/virtualconsole/vcbuttonproperties.cpp |
209 |
+@@ -26,6 +26,7 @@ |
210 |
+ #include <QLineEdit> |
211 |
+ #include <QCheckBox> |
212 |
+ #include <QSpinBox> |
213 |
++#include <QAction> |
214 |
+ #include <qmath.h> |
215 |
+ |
216 |
+ #include "qlcinputchannel.h" |
217 |
+diff --git a/ui/src/virtualconsole/vccuelistproperties.cpp b/ui/src/virtualconsole/vccuelistproperties.cpp |
218 |
+index efcb4dae8..d3a1b9118 100644 |
219 |
+--- a/ui/src/virtualconsole/vccuelistproperties.cpp |
220 |
++++ b/ui/src/virtualconsole/vccuelistproperties.cpp |
221 |
+@@ -17,6 +17,8 @@ |
222 |
+ limitations under the License. |
223 |
+ */ |
224 |
+ |
225 |
++#include <QAction> |
226 |
++ |
227 |
+ #include "vccuelistproperties.h" |
228 |
+ #include "inputselectionwidget.h" |
229 |
+ #include "functionselection.h" |
230 |
+diff --git a/ui/src/virtualconsole/vcpropertieseditor.cpp b/ui/src/virtualconsole/vcpropertieseditor.cpp |
231 |
+index 11ea5cd7b..d1080b06b 100644 |
232 |
+--- a/ui/src/virtualconsole/vcpropertieseditor.cpp |
233 |
++++ b/ui/src/virtualconsole/vcpropertieseditor.cpp |
234 |
+@@ -21,6 +21,7 @@ |
235 |
+ #include <QSettings> |
236 |
+ #include <QCheckBox> |
237 |
+ #include <QSpinBox> |
238 |
++#include <QAction> |
239 |
+ |
240 |
+ #include "qlcinputprofile.h" |
241 |
+ #include "qlcinputchannel.h" |
242 |
+diff --git a/ui/src/virtualconsole/vcsliderproperties.cpp b/ui/src/virtualconsole/vcsliderproperties.cpp |
243 |
+index ff55b71b8..01fd60e9a 100644 |
244 |
+--- a/ui/src/virtualconsole/vcsliderproperties.cpp |
245 |
++++ b/ui/src/virtualconsole/vcsliderproperties.cpp |
246 |
+@@ -28,6 +28,7 @@ |
247 |
+ #include <QLineEdit> |
248 |
+ #include <QSpinBox> |
249 |
+ #include <QLabel> |
250 |
++#include <QAction> |
251 |
+ |
252 |
+ #include "qlccapability.h" |
253 |
+ #include "qlcchannel.h" |
254 |
+diff --git a/ui/src/virtualconsole/vcxypadproperties.cpp b/ui/src/virtualconsole/vcxypadproperties.cpp |
255 |
+index ed7ba7f64..60be83c49 100644 |
256 |
+--- a/ui/src/virtualconsole/vcxypadproperties.cpp |
257 |
++++ b/ui/src/virtualconsole/vcxypadproperties.cpp |
258 |
+@@ -23,6 +23,7 @@ |
259 |
+ #include <QHeaderView> |
260 |
+ #include <QSettings> |
261 |
+ #include <QDebug> |
262 |
++#include <QAction> |
263 |
+ |
264 |
+ #include "qlcfixturemode.h" |
265 |
+ #include "qlcinputchannel.h" |
266 |
\ No newline at end of file |
267 |
|
268 |
diff --git a/app-misc/qlcplus/qlcplus-4.11.1.ebuild b/app-misc/qlcplus/qlcplus-4.11.1.ebuild |
269 |
index db27fbd90c1..de801605d29 100644 |
270 |
--- a/app-misc/qlcplus/qlcplus-4.11.1.ebuild |
271 |
+++ b/app-misc/qlcplus/qlcplus-4.11.1.ebuild |
272 |
@@ -1,4 +1,4 @@ |
273 |
-# Copyright 1999-2017 Gentoo Foundation |
274 |
+# Copyright 1999-2018 Gentoo Foundation |
275 |
# Distributed under the terms of the GNU General Public License v2 |
276 |
|
277 |
EAPI=6 |
278 |
@@ -34,6 +34,8 @@ RDEPEND=" |
279 |
" |
280 |
DEPEND="${RDEPEND}" |
281 |
|
282 |
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) |
283 |
+ |
284 |
src_prepare() { |
285 |
default |
286 |
sed -e "s:/etc/udev/rules.d:${EROOT}lib/udev/rules.d:" -i \ |