commit: 4b3e1f8408d5a1bba5a4262d56e97584522ef097 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu May 21 18:21:45 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu May 21 18:25:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3e1f84
app-misc/qlcplus: Drop 4.11.1 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-misc/qlcplus/Manifest | 1 - .../qlcplus/files/qlcplus-4.11.1-qt-5.11.patch | 243 --------------------- app-misc/qlcplus/qlcplus-4.11.1.ebuild | 63 ------ 3 files changed, 307 deletions(-) diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest index d7cd59f28ee..bf4ca800b61 100644 --- a/app-misc/qlcplus/Manifest +++ b/app-misc/qlcplus/Manifest @@ -1,3 +1,2 @@ -DIST qlcplus-4.11.1.tar.gz 9394093 BLAKE2B 0b91359217b723ed184f6a609ee0ef0a39f5f08aa8933abc7a3c429e4d5a3b2d1dc8ef454c00a172bc0e7b8f7fb0779d7fbba96ed5fafe403853f2a3bb8ce7b8 SHA512 14efdbe5cd53da592a58b48efb1daf7dda2a4e19d7d20792d34674af2aa1b9c287cfd58673db7838885642bb2ebfaf9b462be41d33f8d89497cb61dfab7246df DIST QLC+_4.12.2.tar.gz 10804401 BLAKE2B 95b005985da99d1d1f557b4ac5d6ae7d844ea4f69a7cfa63d79b288ce654b5a70f9e6168f6fd4144496d3cff59a721972acd3ba47fd1477ab4bfd0218f5aeeda SHA512 b274f0559ce15e045d653f4c034dc083922a13c6f9c5e7ba11026b3be9bb85fe447bb489d536dd24bb99bd4b08433f24f1713b73701afff99fa845fcef2547af DIST QLC+_5.0.0_alpha3.tar.gz 10016411 BLAKE2B 51c0885f6e2e286f9f63830bcd269db699946c0969cb0f0a0139f82a421a9a4957ab07612db7aa047fe6650a642479282f6cfe0d124a41a935dd853d09b7253f SHA512 e703747aa243bc4c6b2e9fc3cf1a4e67524fa13fa64a59054e66164e879073b1bd69756a42bb423ff05dcb7da946cbcd99bb9edc3fde9a70d75b8a9f164a71d0 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 deleted file mode 100644 index 1279148283b..00000000000 --- a/app-misc/qlcplus/files/qlcplus-4.11.1-qt-5.11.patch +++ /dev/null @@ -1,243 +0,0 @@ -From f8be095c95831ae6ffc8426a94901197c0dacc38 Mon Sep 17 00:00:00 2001 -From: Jano Svitok <jan.svi...@gmail.com> -Date: Mon, 9 Apr 2018 23:54:50 +0200 -Subject: [PATCH] Fix compilation with QT 5.11.0 beta2 - ---- - fixtureeditor/capabilitywizard.cpp | 1 + - fixtureeditor/editchannel.cpp | 1 + - fixtureeditor/edithead.cpp | 1 + - fixtureeditor/editmode.cpp | 1 + - ui/src/aboutbox.cpp | 1 + - ui/src/addfixture.cpp | 1 + - ui/src/chasereditor.cpp | 1 + - ui/src/fixtureselection.cpp | 1 + - ui/src/functionwizard.cpp | 1 + - ui/src/inputchanneleditor.cpp | 1 + - ui/src/selectinputchannel.cpp | 1 + - ui/src/virtualconsole/addvcbuttonmatrix.cpp | 1 + - ui/src/virtualconsole/addvcslidermatrix.cpp | 1 + - ui/src/virtualconsole/vcbuttonproperties.cpp | 1 + - ui/src/virtualconsole/vccuelistproperties.cpp | 2 ++ - ui/src/virtualconsole/vcpropertieseditor.cpp | 1 + - ui/src/virtualconsole/vcsliderproperties.cpp | 1 + - ui/src/virtualconsole/vcxypadproperties.cpp | 1 + - 18 files changed, 19 insertions(+) - -diff --git a/fixtureeditor/capabilitywizard.cpp b/fixtureeditor/capabilitywizard.cpp -index d77c30fe1..ddb4c5b26 100644 ---- a/fixtureeditor/capabilitywizard.cpp -+++ b/fixtureeditor/capabilitywizard.cpp -@@ -21,6 +21,7 @@ - #include <QTextEdit> - #include <QSpinBox> - #include <QDialog> -+#include <QAction> - - #include "capabilitywizard.h" - #include "qlccapability.h" -diff --git a/fixtureeditor/editchannel.cpp b/fixtureeditor/editchannel.cpp -index c44097783..9278c31b6 100644 ---- a/fixtureeditor/editchannel.cpp -+++ b/fixtureeditor/editchannel.cpp -@@ -32,6 +32,7 @@ - #include <QPainter> - #include <QPoint> - #include <QSize> -+#include <QAction> - - #include "qlccapability.h" - #include "qlcconfig.h" -diff --git a/fixtureeditor/edithead.cpp b/fixtureeditor/edithead.cpp -index a95ecf726..68025b70d 100644 ---- a/fixtureeditor/edithead.cpp -+++ b/fixtureeditor/edithead.cpp -@@ -20,6 +20,7 @@ - #include <QTreeWidgetItem> - #include <QTreeWidget> - #include <QDebug> -+#include <QAction> - - #include "qlcfixturehead.h" - #include "qlcfixturemode.h" -diff --git a/fixtureeditor/editmode.cpp b/fixtureeditor/editmode.cpp -index 440ab4956..5b8b1884f 100644 ---- a/fixtureeditor/editmode.cpp -+++ b/fixtureeditor/editmode.cpp -@@ -30,6 +30,7 @@ - #include <QPoint> - #include <QDebug> - #include <QSize> -+#include <QAction> - - #include "addchannelsdialog.h" - #include "qlcfixturemode.h" -diff --git a/ui/src/aboutbox.cpp b/ui/src/aboutbox.cpp -index 68ece2d54..9296e566b 100644 ---- a/ui/src/aboutbox.cpp -+++ b/ui/src/aboutbox.cpp -@@ -22,6 +22,7 @@ - #include <QTimer> - #include <QDesktopServices> - #include <QUrl> -+#include <QAction> - - #include "qlcconfig.h" - #include "aboutbox.h" -diff --git a/ui/src/addfixture.cpp b/ui/src/addfixture.cpp -index dad12f4e6..ae6bc0efc 100644 ---- a/ui/src/addfixture.cpp -+++ b/ui/src/addfixture.cpp -@@ -30,6 +30,7 @@ - #include <QSpinBox> - #include <QLabel> - #include <QDebug> -+#include <QAction> - - #include "qlcfixturedefcache.h" - #include "qlcfixturemode.h" -diff --git a/ui/src/chasereditor.cpp b/ui/src/chasereditor.cpp -index bd949dcf2..246b71606 100644 ---- a/ui/src/chasereditor.cpp -+++ b/ui/src/chasereditor.cpp -@@ -27,6 +27,7 @@ - #include <QSettings> - #include <QDebug> - #include <QUrl> -+#include <QAction> - - #include "qlcfixturedef.h" - #include "qlcmacros.h" -diff --git a/ui/src/fixtureselection.cpp b/ui/src/fixtureselection.cpp -index 0954a00a1..30851fa21 100644 ---- a/ui/src/fixtureselection.cpp -+++ b/ui/src/fixtureselection.cpp -@@ -21,6 +21,7 @@ - #include <QTreeWidget> - #include <QHeaderView> - #include <QLabel> -+#include <QAction> - - #include "qlcfixturedef.h" - -diff --git a/ui/src/functionwizard.cpp b/ui/src/functionwizard.cpp -index 00e7d5a4c..815b20e4c 100644 ---- a/ui/src/functionwizard.cpp -+++ b/ui/src/functionwizard.cpp -@@ -21,6 +21,7 @@ - #include <QString> - #include <QDebug> - #include <QHash> -+#include <QAction> - - #include "palettegenerator.h" - #include "fixtureselection.h" -diff --git a/ui/src/inputchanneleditor.cpp b/ui/src/inputchanneleditor.cpp -index 6ad638c1f..69b9ca2ae 100644 ---- a/ui/src/inputchanneleditor.cpp -+++ b/ui/src/inputchanneleditor.cpp -@@ -21,6 +21,7 @@ - #include <QComboBox> - #include <QSpinBox> - #include <QIcon> -+#include <QAction> - - #include "qlcchannel.h" - #include "qlcinputprofile.h" -diff --git a/ui/src/selectinputchannel.cpp b/ui/src/selectinputchannel.cpp -index c07c617fe..72006f2ca 100644 ---- a/ui/src/selectinputchannel.cpp -+++ b/ui/src/selectinputchannel.cpp -@@ -21,6 +21,7 @@ - #include <QTreeWidgetItem> - #include <QTreeWidget> - #include <QDebug> -+#include <QAction> - - #include "selectinputchannel.h" - #include "qlcinputchannel.h" -diff --git a/ui/src/virtualconsole/addvcbuttonmatrix.cpp b/ui/src/virtualconsole/addvcbuttonmatrix.cpp -index 7ad7160e8..09523bd04 100644 ---- a/ui/src/virtualconsole/addvcbuttonmatrix.cpp -+++ b/ui/src/virtualconsole/addvcbuttonmatrix.cpp -@@ -19,6 +19,7 @@ - - #include <QSettings> - #include <QDebug> -+#include <QAction> - - #include "addvcbuttonmatrix.h" - #include "functionselection.h" -diff --git a/ui/src/virtualconsole/addvcslidermatrix.cpp b/ui/src/virtualconsole/addvcslidermatrix.cpp -index 63aa9dcce..cd80b3fe3 100644 ---- a/ui/src/virtualconsole/addvcslidermatrix.cpp -+++ b/ui/src/virtualconsole/addvcslidermatrix.cpp -@@ -19,6 +19,7 @@ - - #include <QSettings> - #include <QSpinBox> -+#include <QAction> - - #include "addvcslidermatrix.h" - #include "vcpropertieseditor.h" -diff --git a/ui/src/virtualconsole/vcbuttonproperties.cpp b/ui/src/virtualconsole/vcbuttonproperties.cpp -index ef0bb24ee..8e6dbde72 100644 ---- a/ui/src/virtualconsole/vcbuttonproperties.cpp -+++ b/ui/src/virtualconsole/vcbuttonproperties.cpp -@@ -26,6 +26,7 @@ - #include <QLineEdit> - #include <QCheckBox> - #include <QSpinBox> -+#include <QAction> - #include <qmath.h> - - #include "qlcinputchannel.h" -diff --git a/ui/src/virtualconsole/vccuelistproperties.cpp b/ui/src/virtualconsole/vccuelistproperties.cpp -index efcb4dae8..d3a1b9118 100644 ---- a/ui/src/virtualconsole/vccuelistproperties.cpp -+++ b/ui/src/virtualconsole/vccuelistproperties.cpp -@@ -17,6 +17,8 @@ - limitations under the License. - */ - -+#include <QAction> -+ - #include "vccuelistproperties.h" - #include "inputselectionwidget.h" - #include "functionselection.h" -diff --git a/ui/src/virtualconsole/vcpropertieseditor.cpp b/ui/src/virtualconsole/vcpropertieseditor.cpp -index 11ea5cd7b..d1080b06b 100644 ---- a/ui/src/virtualconsole/vcpropertieseditor.cpp -+++ b/ui/src/virtualconsole/vcpropertieseditor.cpp -@@ -21,6 +21,7 @@ - #include <QSettings> - #include <QCheckBox> - #include <QSpinBox> -+#include <QAction> - - #include "qlcinputprofile.h" - #include "qlcinputchannel.h" -diff --git a/ui/src/virtualconsole/vcsliderproperties.cpp b/ui/src/virtualconsole/vcsliderproperties.cpp -index ff55b71b8..01fd60e9a 100644 ---- a/ui/src/virtualconsole/vcsliderproperties.cpp -+++ b/ui/src/virtualconsole/vcsliderproperties.cpp -@@ -28,6 +28,7 @@ - #include <QLineEdit> - #include <QSpinBox> - #include <QLabel> -+#include <QAction> - - #include "qlccapability.h" - #include "qlcchannel.h" -diff --git a/ui/src/virtualconsole/vcxypadproperties.cpp b/ui/src/virtualconsole/vcxypadproperties.cpp -index ed7ba7f64..60be83c49 100644 ---- a/ui/src/virtualconsole/vcxypadproperties.cpp -+++ b/ui/src/virtualconsole/vcxypadproperties.cpp -@@ -23,6 +23,7 @@ - #include <QHeaderView> - #include <QSettings> - #include <QDebug> -+#include <QAction> - - #include "qlcfixturemode.h" - #include "qlcinputchannel.h" \ No newline at end of file diff --git a/app-misc/qlcplus/qlcplus-4.11.1.ebuild b/app-misc/qlcplus/qlcplus-4.11.1.ebuild deleted file mode 100644 index 41463fba3ff..00000000000 --- a/app-misc/qlcplus/qlcplus-4.11.1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit qmake-utils udev vcs-snapshot virtualx xdg - -DESCRIPTION="A software to control DMX or analog lighting systems" -HOMEPAGE="https://www.qlcplus.org/"; -SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - || ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 ) - dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtnetwork:5 - dev-qt/qtscript:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - media-libs/alsa-lib - media-libs/libmad - media-libs/libsndfile - sci-libs/fftw:3.0 - virtual/libusb:0 - virtual/libusb:1 - virtual/udev -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) - -src_prepare() { - default - sed -e "s:/etc/udev/rules.d:${EROOT}lib/udev/rules.d:" -i \ - plugins/hid/hid.pro \ - plugins/udmx/src/src.pro \ - plugins/dmxusb/src/src.pro \ - plugins/spi/spi.pro \ - plugins/peperoni/unix/unix.pro || die - sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \ - -i variables.pri || die -} - -src_configure() { - eqmake5 - - # sandbox error "mkdir /usr/share/qlcplus" - # see https://bugs.gentoo.org/621500#c2 - export INSTALL_ROOT="${D}" -} - -src_test() { - virtx emake check -}
