diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-25 07:36:27 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-25 07:36:27 +0100 |
commit | 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch) | |
tree | 6208a7f4fc744684fce0f55acbb47511acace498 /app-misc/qlcplus | |
parent | 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff) |
gentoo resync : 25.08.2018
Diffstat (limited to 'app-misc/qlcplus')
-rw-r--r-- | app-misc/qlcplus/Manifest | 3 | ||||
-rw-r--r-- | app-misc/qlcplus/files/qlcplus-4.11.1-qt-5.11.patch | 243 | ||||
-rw-r--r-- | app-misc/qlcplus/qlcplus-4.11.1.ebuild | 4 |
3 files changed, 248 insertions, 2 deletions
diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest index 24618dea9b1a..a6f790174989 100644 --- a/app-misc/qlcplus/Manifest +++ b/app-misc/qlcplus/Manifest @@ -1,3 +1,4 @@ +AUX qlcplus-4.11.1-qt-5.11.patch 7589 BLAKE2B 30aeafe90d1013fabe5d2f059ad483a3ddef64edeb691bf7a21b818b946cdbe028d52e4a13e29b0c0c571504dc0cac215e93584bf5a71f6ccfbdd807a16faf3d SHA512 e9b1b160463356a7a9c7768a55435a50a9c7081b342807bdd83282bc500a186f81420402db321463bb2e2ad29db95c3b8b33a7621aa481e34668420c85213636 DIST qlcplus-4.11.1.tar.gz 9394093 BLAKE2B 0b91359217b723ed184f6a609ee0ef0a39f5f08aa8933abc7a3c429e4d5a3b2d1dc8ef454c00a172bc0e7b8f7fb0779d7fbba96ed5fafe403853f2a3bb8ce7b8 SHA512 14efdbe5cd53da592a58b48efb1daf7dda2a4e19d7d20792d34674af2aa1b9c287cfd58673db7838885642bb2ebfaf9b462be41d33f8d89497cb61dfab7246df -EBUILD qlcplus-4.11.1.ebuild 1307 BLAKE2B 6b1d664e7370bb3e21465c8bed0b966e634d106797004f0997df552db14daec41f9f0b2a9a5d4d99a718c0248534416f4e8110c705b65771ee9ef755a74baf7c SHA512 1c8d14210707b7d758056bf80b5d1736db088cc46b0b1d790f4ffd8232eff307020a24d3b4038345e3943d0749ba40240a92b059e08a1089473c715040cec997 +EBUILD qlcplus-4.11.1.ebuild 1353 BLAKE2B 2ca629dcbc50ff860abb98ec27146521acafc69621aa1096b10a5e6d95ac1d6b11eaf90cbecb9092e9820d5e743085f82c661676333fb247d855872e214a8334 SHA512 bbbb98982ac9afabf3ed5729b6acd04257a4ac6bfc7c09c19e514f12317a68f4511bc245c0fd26a575e87dd21437e44b3848f2001d33ba01e91acd895b2cd60e MISC metadata.xml 326 BLAKE2B 8d391e1f300d364a5e985caad82387023c6f9d6081313b571ece49d2f5daf60f25527685bb7567ad18cbe3234202f8fe53b0a786b401477687b5b8ec39dfc1d9 SHA512 5de2dc43ec5ae4d9a2c598cfac00dc124a956040d0721cb867acc5c4ed312e8c9ef415205eaaed8ff5742281251c970a5ade2eae6280b62477f4fda3fedc2504 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 new file mode 100644 index 000000000000..1279148283b1 --- /dev/null +++ b/app-misc/qlcplus/files/qlcplus-4.11.1-qt-5.11.patch @@ -0,0 +1,243 @@ +From f8be095c95831ae6ffc8426a94901197c0dacc38 Mon Sep 17 00:00:00 2001 +From: Jano Svitok <jan.svitok@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 index db27fbd90c1b..de801605d298 100644 --- a/app-misc/qlcplus/qlcplus-4.11.1.ebuild +++ b/app-misc/qlcplus/qlcplus-4.11.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -34,6 +34,8 @@ RDEPEND=" " 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 \ |