1 |
commit: 4b3e1f8408d5a1bba5a4262d56e97584522ef097 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 21 18:21:45 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 21 18:25:56 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3e1f84 |
7 |
|
8 |
app-misc/qlcplus: Drop 4.11.1 |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
app-misc/qlcplus/Manifest | 1 - |
14 |
.../qlcplus/files/qlcplus-4.11.1-qt-5.11.patch | 243 --------------------- |
15 |
app-misc/qlcplus/qlcplus-4.11.1.ebuild | 63 ------ |
16 |
3 files changed, 307 deletions(-) |
17 |
|
18 |
diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest |
19 |
index d7cd59f28ee..bf4ca800b61 100644 |
20 |
--- a/app-misc/qlcplus/Manifest |
21 |
+++ b/app-misc/qlcplus/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST qlcplus-4.11.1.tar.gz 9394093 BLAKE2B 0b91359217b723ed184f6a609ee0ef0a39f5f08aa8933abc7a3c429e4d5a3b2d1dc8ef454c00a172bc0e7b8f7fb0779d7fbba96ed5fafe403853f2a3bb8ce7b8 SHA512 14efdbe5cd53da592a58b48efb1daf7dda2a4e19d7d20792d34674af2aa1b9c287cfd58673db7838885642bb2ebfaf9b462be41d33f8d89497cb61dfab7246df |
24 |
DIST QLC+_4.12.2.tar.gz 10804401 BLAKE2B 95b005985da99d1d1f557b4ac5d6ae7d844ea4f69a7cfa63d79b288ce654b5a70f9e6168f6fd4144496d3cff59a721972acd3ba47fd1477ab4bfd0218f5aeeda SHA512 b274f0559ce15e045d653f4c034dc083922a13c6f9c5e7ba11026b3be9bb85fe447bb489d536dd24bb99bd4b08433f24f1713b73701afff99fa845fcef2547af |
25 |
DIST QLC+_5.0.0_alpha3.tar.gz 10016411 BLAKE2B 51c0885f6e2e286f9f63830bcd269db699946c0969cb0f0a0139f82a421a9a4957ab07612db7aa047fe6650a642479282f6cfe0d124a41a935dd853d09b7253f SHA512 e703747aa243bc4c6b2e9fc3cf1a4e67524fa13fa64a59054e66164e879073b1bd69756a42bb423ff05dcb7da946cbcd99bb9edc3fde9a70d75b8a9f164a71d0 |
26 |
|
27 |
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 |
28 |
deleted file mode 100644 |
29 |
index 1279148283b..00000000000 |
30 |
--- a/app-misc/qlcplus/files/qlcplus-4.11.1-qt-5.11.patch |
31 |
+++ /dev/null |
32 |
@@ -1,243 +0,0 @@ |
33 |
-From f8be095c95831ae6ffc8426a94901197c0dacc38 Mon Sep 17 00:00:00 2001 |
34 |
-From: Jano Svitok <jan.svitok@×××××.com> |
35 |
-Date: Mon, 9 Apr 2018 23:54:50 +0200 |
36 |
-Subject: [PATCH] Fix compilation with QT 5.11.0 beta2 |
37 |
- |
38 |
---- |
39 |
- fixtureeditor/capabilitywizard.cpp | 1 + |
40 |
- fixtureeditor/editchannel.cpp | 1 + |
41 |
- fixtureeditor/edithead.cpp | 1 + |
42 |
- fixtureeditor/editmode.cpp | 1 + |
43 |
- ui/src/aboutbox.cpp | 1 + |
44 |
- ui/src/addfixture.cpp | 1 + |
45 |
- ui/src/chasereditor.cpp | 1 + |
46 |
- ui/src/fixtureselection.cpp | 1 + |
47 |
- ui/src/functionwizard.cpp | 1 + |
48 |
- ui/src/inputchanneleditor.cpp | 1 + |
49 |
- ui/src/selectinputchannel.cpp | 1 + |
50 |
- ui/src/virtualconsole/addvcbuttonmatrix.cpp | 1 + |
51 |
- ui/src/virtualconsole/addvcslidermatrix.cpp | 1 + |
52 |
- ui/src/virtualconsole/vcbuttonproperties.cpp | 1 + |
53 |
- ui/src/virtualconsole/vccuelistproperties.cpp | 2 ++ |
54 |
- ui/src/virtualconsole/vcpropertieseditor.cpp | 1 + |
55 |
- ui/src/virtualconsole/vcsliderproperties.cpp | 1 + |
56 |
- ui/src/virtualconsole/vcxypadproperties.cpp | 1 + |
57 |
- 18 files changed, 19 insertions(+) |
58 |
- |
59 |
-diff --git a/fixtureeditor/capabilitywizard.cpp b/fixtureeditor/capabilitywizard.cpp |
60 |
-index d77c30fe1..ddb4c5b26 100644 |
61 |
---- a/fixtureeditor/capabilitywizard.cpp |
62 |
-+++ b/fixtureeditor/capabilitywizard.cpp |
63 |
-@@ -21,6 +21,7 @@ |
64 |
- #include <QTextEdit> |
65 |
- #include <QSpinBox> |
66 |
- #include <QDialog> |
67 |
-+#include <QAction> |
68 |
- |
69 |
- #include "capabilitywizard.h" |
70 |
- #include "qlccapability.h" |
71 |
-diff --git a/fixtureeditor/editchannel.cpp b/fixtureeditor/editchannel.cpp |
72 |
-index c44097783..9278c31b6 100644 |
73 |
---- a/fixtureeditor/editchannel.cpp |
74 |
-+++ b/fixtureeditor/editchannel.cpp |
75 |
-@@ -32,6 +32,7 @@ |
76 |
- #include <QPainter> |
77 |
- #include <QPoint> |
78 |
- #include <QSize> |
79 |
-+#include <QAction> |
80 |
- |
81 |
- #include "qlccapability.h" |
82 |
- #include "qlcconfig.h" |
83 |
-diff --git a/fixtureeditor/edithead.cpp b/fixtureeditor/edithead.cpp |
84 |
-index a95ecf726..68025b70d 100644 |
85 |
---- a/fixtureeditor/edithead.cpp |
86 |
-+++ b/fixtureeditor/edithead.cpp |
87 |
-@@ -20,6 +20,7 @@ |
88 |
- #include <QTreeWidgetItem> |
89 |
- #include <QTreeWidget> |
90 |
- #include <QDebug> |
91 |
-+#include <QAction> |
92 |
- |
93 |
- #include "qlcfixturehead.h" |
94 |
- #include "qlcfixturemode.h" |
95 |
-diff --git a/fixtureeditor/editmode.cpp b/fixtureeditor/editmode.cpp |
96 |
-index 440ab4956..5b8b1884f 100644 |
97 |
---- a/fixtureeditor/editmode.cpp |
98 |
-+++ b/fixtureeditor/editmode.cpp |
99 |
-@@ -30,6 +30,7 @@ |
100 |
- #include <QPoint> |
101 |
- #include <QDebug> |
102 |
- #include <QSize> |
103 |
-+#include <QAction> |
104 |
- |
105 |
- #include "addchannelsdialog.h" |
106 |
- #include "qlcfixturemode.h" |
107 |
-diff --git a/ui/src/aboutbox.cpp b/ui/src/aboutbox.cpp |
108 |
-index 68ece2d54..9296e566b 100644 |
109 |
---- a/ui/src/aboutbox.cpp |
110 |
-+++ b/ui/src/aboutbox.cpp |
111 |
-@@ -22,6 +22,7 @@ |
112 |
- #include <QTimer> |
113 |
- #include <QDesktopServices> |
114 |
- #include <QUrl> |
115 |
-+#include <QAction> |
116 |
- |
117 |
- #include "qlcconfig.h" |
118 |
- #include "aboutbox.h" |
119 |
-diff --git a/ui/src/addfixture.cpp b/ui/src/addfixture.cpp |
120 |
-index dad12f4e6..ae6bc0efc 100644 |
121 |
---- a/ui/src/addfixture.cpp |
122 |
-+++ b/ui/src/addfixture.cpp |
123 |
-@@ -30,6 +30,7 @@ |
124 |
- #include <QSpinBox> |
125 |
- #include <QLabel> |
126 |
- #include <QDebug> |
127 |
-+#include <QAction> |
128 |
- |
129 |
- #include "qlcfixturedefcache.h" |
130 |
- #include "qlcfixturemode.h" |
131 |
-diff --git a/ui/src/chasereditor.cpp b/ui/src/chasereditor.cpp |
132 |
-index bd949dcf2..246b71606 100644 |
133 |
---- a/ui/src/chasereditor.cpp |
134 |
-+++ b/ui/src/chasereditor.cpp |
135 |
-@@ -27,6 +27,7 @@ |
136 |
- #include <QSettings> |
137 |
- #include <QDebug> |
138 |
- #include <QUrl> |
139 |
-+#include <QAction> |
140 |
- |
141 |
- #include "qlcfixturedef.h" |
142 |
- #include "qlcmacros.h" |
143 |
-diff --git a/ui/src/fixtureselection.cpp b/ui/src/fixtureselection.cpp |
144 |
-index 0954a00a1..30851fa21 100644 |
145 |
---- a/ui/src/fixtureselection.cpp |
146 |
-+++ b/ui/src/fixtureselection.cpp |
147 |
-@@ -21,6 +21,7 @@ |
148 |
- #include <QTreeWidget> |
149 |
- #include <QHeaderView> |
150 |
- #include <QLabel> |
151 |
-+#include <QAction> |
152 |
- |
153 |
- #include "qlcfixturedef.h" |
154 |
- |
155 |
-diff --git a/ui/src/functionwizard.cpp b/ui/src/functionwizard.cpp |
156 |
-index 00e7d5a4c..815b20e4c 100644 |
157 |
---- a/ui/src/functionwizard.cpp |
158 |
-+++ b/ui/src/functionwizard.cpp |
159 |
-@@ -21,6 +21,7 @@ |
160 |
- #include <QString> |
161 |
- #include <QDebug> |
162 |
- #include <QHash> |
163 |
-+#include <QAction> |
164 |
- |
165 |
- #include "palettegenerator.h" |
166 |
- #include "fixtureselection.h" |
167 |
-diff --git a/ui/src/inputchanneleditor.cpp b/ui/src/inputchanneleditor.cpp |
168 |
-index 6ad638c1f..69b9ca2ae 100644 |
169 |
---- a/ui/src/inputchanneleditor.cpp |
170 |
-+++ b/ui/src/inputchanneleditor.cpp |
171 |
-@@ -21,6 +21,7 @@ |
172 |
- #include <QComboBox> |
173 |
- #include <QSpinBox> |
174 |
- #include <QIcon> |
175 |
-+#include <QAction> |
176 |
- |
177 |
- #include "qlcchannel.h" |
178 |
- #include "qlcinputprofile.h" |
179 |
-diff --git a/ui/src/selectinputchannel.cpp b/ui/src/selectinputchannel.cpp |
180 |
-index c07c617fe..72006f2ca 100644 |
181 |
---- a/ui/src/selectinputchannel.cpp |
182 |
-+++ b/ui/src/selectinputchannel.cpp |
183 |
-@@ -21,6 +21,7 @@ |
184 |
- #include <QTreeWidgetItem> |
185 |
- #include <QTreeWidget> |
186 |
- #include <QDebug> |
187 |
-+#include <QAction> |
188 |
- |
189 |
- #include "selectinputchannel.h" |
190 |
- #include "qlcinputchannel.h" |
191 |
-diff --git a/ui/src/virtualconsole/addvcbuttonmatrix.cpp b/ui/src/virtualconsole/addvcbuttonmatrix.cpp |
192 |
-index 7ad7160e8..09523bd04 100644 |
193 |
---- a/ui/src/virtualconsole/addvcbuttonmatrix.cpp |
194 |
-+++ b/ui/src/virtualconsole/addvcbuttonmatrix.cpp |
195 |
-@@ -19,6 +19,7 @@ |
196 |
- |
197 |
- #include <QSettings> |
198 |
- #include <QDebug> |
199 |
-+#include <QAction> |
200 |
- |
201 |
- #include "addvcbuttonmatrix.h" |
202 |
- #include "functionselection.h" |
203 |
-diff --git a/ui/src/virtualconsole/addvcslidermatrix.cpp b/ui/src/virtualconsole/addvcslidermatrix.cpp |
204 |
-index 63aa9dcce..cd80b3fe3 100644 |
205 |
---- a/ui/src/virtualconsole/addvcslidermatrix.cpp |
206 |
-+++ b/ui/src/virtualconsole/addvcslidermatrix.cpp |
207 |
-@@ -19,6 +19,7 @@ |
208 |
- |
209 |
- #include <QSettings> |
210 |
- #include <QSpinBox> |
211 |
-+#include <QAction> |
212 |
- |
213 |
- #include "addvcslidermatrix.h" |
214 |
- #include "vcpropertieseditor.h" |
215 |
-diff --git a/ui/src/virtualconsole/vcbuttonproperties.cpp b/ui/src/virtualconsole/vcbuttonproperties.cpp |
216 |
-index ef0bb24ee..8e6dbde72 100644 |
217 |
---- a/ui/src/virtualconsole/vcbuttonproperties.cpp |
218 |
-+++ b/ui/src/virtualconsole/vcbuttonproperties.cpp |
219 |
-@@ -26,6 +26,7 @@ |
220 |
- #include <QLineEdit> |
221 |
- #include <QCheckBox> |
222 |
- #include <QSpinBox> |
223 |
-+#include <QAction> |
224 |
- #include <qmath.h> |
225 |
- |
226 |
- #include "qlcinputchannel.h" |
227 |
-diff --git a/ui/src/virtualconsole/vccuelistproperties.cpp b/ui/src/virtualconsole/vccuelistproperties.cpp |
228 |
-index efcb4dae8..d3a1b9118 100644 |
229 |
---- a/ui/src/virtualconsole/vccuelistproperties.cpp |
230 |
-+++ b/ui/src/virtualconsole/vccuelistproperties.cpp |
231 |
-@@ -17,6 +17,8 @@ |
232 |
- limitations under the License. |
233 |
- */ |
234 |
- |
235 |
-+#include <QAction> |
236 |
-+ |
237 |
- #include "vccuelistproperties.h" |
238 |
- #include "inputselectionwidget.h" |
239 |
- #include "functionselection.h" |
240 |
-diff --git a/ui/src/virtualconsole/vcpropertieseditor.cpp b/ui/src/virtualconsole/vcpropertieseditor.cpp |
241 |
-index 11ea5cd7b..d1080b06b 100644 |
242 |
---- a/ui/src/virtualconsole/vcpropertieseditor.cpp |
243 |
-+++ b/ui/src/virtualconsole/vcpropertieseditor.cpp |
244 |
-@@ -21,6 +21,7 @@ |
245 |
- #include <QSettings> |
246 |
- #include <QCheckBox> |
247 |
- #include <QSpinBox> |
248 |
-+#include <QAction> |
249 |
- |
250 |
- #include "qlcinputprofile.h" |
251 |
- #include "qlcinputchannel.h" |
252 |
-diff --git a/ui/src/virtualconsole/vcsliderproperties.cpp b/ui/src/virtualconsole/vcsliderproperties.cpp |
253 |
-index ff55b71b8..01fd60e9a 100644 |
254 |
---- a/ui/src/virtualconsole/vcsliderproperties.cpp |
255 |
-+++ b/ui/src/virtualconsole/vcsliderproperties.cpp |
256 |
-@@ -28,6 +28,7 @@ |
257 |
- #include <QLineEdit> |
258 |
- #include <QSpinBox> |
259 |
- #include <QLabel> |
260 |
-+#include <QAction> |
261 |
- |
262 |
- #include "qlccapability.h" |
263 |
- #include "qlcchannel.h" |
264 |
-diff --git a/ui/src/virtualconsole/vcxypadproperties.cpp b/ui/src/virtualconsole/vcxypadproperties.cpp |
265 |
-index ed7ba7f64..60be83c49 100644 |
266 |
---- a/ui/src/virtualconsole/vcxypadproperties.cpp |
267 |
-+++ b/ui/src/virtualconsole/vcxypadproperties.cpp |
268 |
-@@ -23,6 +23,7 @@ |
269 |
- #include <QHeaderView> |
270 |
- #include <QSettings> |
271 |
- #include <QDebug> |
272 |
-+#include <QAction> |
273 |
- |
274 |
- #include "qlcfixturemode.h" |
275 |
- #include "qlcinputchannel.h" |
276 |
\ No newline at end of file |
277 |
|
278 |
diff --git a/app-misc/qlcplus/qlcplus-4.11.1.ebuild b/app-misc/qlcplus/qlcplus-4.11.1.ebuild |
279 |
deleted file mode 100644 |
280 |
index 41463fba3ff..00000000000 |
281 |
--- a/app-misc/qlcplus/qlcplus-4.11.1.ebuild |
282 |
+++ /dev/null |
283 |
@@ -1,63 +0,0 @@ |
284 |
-# Copyright 1999-2018 Gentoo Authors |
285 |
-# Distributed under the terms of the GNU General Public License v2 |
286 |
- |
287 |
-EAPI=6 |
288 |
- |
289 |
-inherit qmake-utils udev vcs-snapshot virtualx xdg |
290 |
- |
291 |
-DESCRIPTION="A software to control DMX or analog lighting systems" |
292 |
-HOMEPAGE="https://www.qlcplus.org/" |
293 |
-SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz -> ${P}.tar.gz" |
294 |
- |
295 |
-LICENSE="Apache-2.0" |
296 |
-SLOT="0" |
297 |
-KEYWORDS="~amd64" |
298 |
-IUSE="test" |
299 |
- |
300 |
-RESTRICT="!test? ( test )" |
301 |
- |
302 |
-RDEPEND=" |
303 |
- || ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 ) |
304 |
- dev-libs/glib:2 |
305 |
- dev-qt/qtcore:5 |
306 |
- dev-qt/qtgui:5 |
307 |
- dev-qt/qtmultimedia:5[widgets] |
308 |
- dev-qt/qtnetwork:5 |
309 |
- dev-qt/qtscript:5 |
310 |
- dev-qt/qttest:5 |
311 |
- dev-qt/qtwidgets:5 |
312 |
- media-libs/alsa-lib |
313 |
- media-libs/libmad |
314 |
- media-libs/libsndfile |
315 |
- sci-libs/fftw:3.0 |
316 |
- virtual/libusb:0 |
317 |
- virtual/libusb:1 |
318 |
- virtual/udev |
319 |
-" |
320 |
-DEPEND="${RDEPEND}" |
321 |
- |
322 |
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) |
323 |
- |
324 |
-src_prepare() { |
325 |
- default |
326 |
- sed -e "s:/etc/udev/rules.d:${EROOT}lib/udev/rules.d:" -i \ |
327 |
- plugins/hid/hid.pro \ |
328 |
- plugins/udmx/src/src.pro \ |
329 |
- plugins/dmxusb/src/src.pro \ |
330 |
- plugins/spi/spi.pro \ |
331 |
- plugins/peperoni/unix/unix.pro || die |
332 |
- sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \ |
333 |
- -i variables.pri || die |
334 |
-} |
335 |
- |
336 |
-src_configure() { |
337 |
- eqmake5 |
338 |
- |
339 |
- # sandbox error "mkdir /usr/share/qlcplus" |
340 |
- # see https://bugs.gentoo.org/621500#c2 |
341 |
- export INSTALL_ROOT="${D}" |
342 |
-} |
343 |
- |
344 |
-src_test() { |
345 |
- virtx emake check |
346 |
-} |