* [gentoo-commits] repo/gentoo:master commit in: app-misc/qlcplus/, app-misc/qlcplus/files/
@ 2018-08-18 7:20 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-08-18 7:20 UTC (permalink / raw
To: gentoo-commits
commit: 5957a326f9054d0684726f42d8a1f397cab41c1e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 07:19:02 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 18 07:20:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5957a326
app-misc/qlcplus: Fix build with Qt 5.11
Closes: https://bugs.gentoo.org/660456
Package-Manager: Portage-2.3.47, Repoman-2.3.10
.../qlcplus/files/qlcplus-4.11.1-qt-5.11.patch | 243 +++++++++++++++++++++
app-misc/qlcplus/qlcplus-4.11.1.ebuild | 4 +-
2 files changed, 246 insertions(+), 1 deletion(-)
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 00000000000..1279148283b
--- /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 db27fbd90c1..de801605d29 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 \
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/qlcplus/, app-misc/qlcplus/files/
@ 2022-08-04 6:37 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2022-08-04 6:37 UTC (permalink / raw
To: gentoo-commits
commit: 9cc6eaa77dc60fb031455afae705658c818c94f7
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 4 06:36:45 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Aug 4 06:37:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc6eaa7
app-misc/qlcplus: add upstream patch to fix a test issue in 4.12.5
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/qlcplus-4.12.5-fix-test-issue.patch | 59 ++++++++++++++++++++++
app-misc/qlcplus/qlcplus-4.12.5.ebuild | 2 +
2 files changed, 61 insertions(+)
diff --git a/app-misc/qlcplus/files/qlcplus-4.12.5-fix-test-issue.patch b/app-misc/qlcplus/files/qlcplus-4.12.5-fix-test-issue.patch
new file mode 100644
index 000000000000..d7cffba6ff8c
--- /dev/null
+++ b/app-misc/qlcplus/files/qlcplus-4.12.5-fix-test-issue.patch
@@ -0,0 +1,59 @@
+From 2ee0e053e39587d29789a26a37309445df222a0c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?=
+ <jeromelebleu@users.noreply.github.com>
+Date: Fri, 8 Jul 2022 09:41:21 +0200
+Subject: [PATCH] Round values explicitly in FadeChannel and KeyPadParser
+
+Fix #1344
+---
+ engine/src/fadechannel.cpp | 9 +++------
+ engine/src/keypadparser.cpp | 6 ++++--
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/engine/src/fadechannel.cpp b/engine/src/fadechannel.cpp
+index 537b0fd9f..c642360be 100644
+--- a/engine/src/fadechannel.cpp
++++ b/engine/src/fadechannel.cpp
+@@ -323,14 +323,11 @@ uchar FadeChannel::calculateCurrent(uint fadeTime, uint elapsedTime)
+ // 16 bit fading works as long as MSB and LSB channels
+ // are targeting the same value. E.g. Red and Red Fine both at 158
+ float val = (float(m_target - m_start) * (float(elapsedTime) / float(fadeTime))) + float(m_start);
++ long rval = lrintf(val * 256);
+ if (m_flags & Fine)
+- {
+- m_current = ((val - floor(val)) * float(UCHAR_MAX));
+- }
++ m_current = rval & 0xff;
+ else
+- {
+- m_current = val;
+- }
++ m_current = rval / 256;
+ }
+
+ return uchar(m_current);
+diff --git a/engine/src/keypadparser.cpp b/engine/src/keypadparser.cpp
+index bc2d64cbc..36a4fe9b9 100644
+--- a/engine/src/keypadparser.cpp
++++ b/engine/src/keypadparser.cpp
+@@ -17,6 +17,8 @@
+ limitations under the License.
+ */
+
++#include <cmath>
++
+ #include "keypadparser.h"
+ #include "qlcmacros.h"
+
+@@ -194,9 +196,9 @@ QList<SceneValue> KeyPadParser::parseCommand(Doc *doc, QString command,
+ else if (lastCommand == CommandMinus)
+ scv.value = CLAMP(uniValue - toValue, 0, 255);
+ else if (lastCommand == CommandPlusPercent)
+- scv.value = CLAMP(uniValue * (1.0 + toValue), 0, 255);
++ scv.value = CLAMP(lrintf(uniValue * (1.0 + toValue)), 0, 255);
+ else if (lastCommand == CommandMinusPercent)
+- scv.value = CLAMP(uniValue - (float(uniValue) * toValue), 0, 255);
++ scv.value = CLAMP(lrintf(uniValue - (float(uniValue) * toValue)), 0, 255);
+ else if (lastCommand == CommandZERO)
+ scv.value = 0;
+ else if (lastCommand == CommandFULL)
diff --git a/app-misc/qlcplus/qlcplus-4.12.5.ebuild b/app-misc/qlcplus/qlcplus-4.12.5.ebuild
index a178db0add32..bdcb55edcf6b 100644
--- a/app-misc/qlcplus/qlcplus-4.12.5.ebuild
+++ b/app-misc/qlcplus/qlcplus-4.12.5.ebuild
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
dev-qt/qttest:5
"
+PATCHES=( "${FILESDIR}"/qlcplus-4.12.5-fix-test-issue.patch )
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-04 6:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-04 6:37 [gentoo-commits] repo/gentoo:master commit in: app-misc/qlcplus/, app-misc/qlcplus/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2018-08-18 7:20 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox