From 9324d24e065f23de4fd1036f1c760e8f1ed3d218 Mon Sep 17 00:00:00 2001
From: Jacob <Jacalz@users.noreply.github.com>
Date: Fri, 3 Jan 2020 17:44:45 +0100
Subject: [PATCH] Correct some more Qt4 leftovers
---
INSTALL.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/INSTALL.md b/INSTALL.md
index 1942a88c..6668521b 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -47,7 +47,7 @@ After install, the app/tools will still work on distributions with python2 as de
===== RUNTIME DEPENDENCIES =====
----------------------------------
-All tools require Python3 and Qt4, some of them work on Windows and Mac. <br/>
+All tools require Python3 and Qt5 (PyQt5), some of them work on Windows and Mac. <br/>
Here's the required run-time dependencies of each of the main tools:
### Cadence
From bf0869c111fd72e3a1caf804a7665dce9698632f Mon Sep 17 00:00:00 2001
From: Gerion Entrup <gerion.entrup@flump.de>
Date: Sun, 10 May 2020 02:07:58 +0200
Subject: [PATCH] catia/claudia: fix startup when a2j not present
Consider this code:
```
a = None
print(a and a.b)
```
This evaluates to None and not to False.
Closes: #274
---
src/catia.py | 2 +-
src/claudia.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/catia.py b/src/catia.py
index dded9e1c..819bb8da 100755
--- a/src/catia.py
+++ b/src/catia.py
@@ -1009,7 +1009,7 @@ def menuA2JBridge(self, started):
if gDBus.jack and not gDBus.jack.IsStarted():
self.ui.act_tools_a2j_start.setEnabled(False)
self.ui.act_tools_a2j_stop.setEnabled(False)
- self.ui.act_tools_a2j_export_hw.setEnabled(gDBus.a2j and not gDBus.a2j.is_started())
+ self.ui.act_tools_a2j_export_hw.setEnabled(bool(gDBus.a2j) and not gDBus.a2j.is_started())
else:
self.ui.act_tools_a2j_start.setEnabled(not started)
self.ui.act_tools_a2j_stop.setEnabled(started)
diff --git a/src/claudia.py b/src/claudia.py
index 88280094..4f4dbc7c 100755
--- a/src/claudia.py
+++ b/src/claudia.py
@@ -1515,7 +1515,7 @@ def menuA2JBridge(self, started):
if not gDBus.jack.IsStarted():
self.ui.act_tools_a2j_start.setEnabled(False)
self.ui.act_tools_a2j_stop.setEnabled(False)
- self.ui.act_tools_a2j_export_hw.setEnabled(gDBus.a2j and not gDBus.a2j.is_started())
+ self.ui.act_tools_a2j_export_hw.setEnabled(bool(gDBus.a2j) and not gDBus.a2j.is_started())
else:
self.ui.act_tools_a2j_start.setEnabled(not started)
self.ui.act_tools_a2j_stop.setEnabled(started)
From 57879082d1f349c8debce415e32755564b105214 Mon Sep 17 00:00:00 2001
From: t-mw <t-mw@users.noreply.github.com>
Date: Mon, 4 May 2020 09:26:08 +0200
Subject: [PATCH] Fix exit code for cadence-session-start -s
---
src/cadence_session_start.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/cadence_session_start.py b/src/cadence_session_start.py
index 8ed1f8f8..63857a68 100755
--- a/src/cadence_session_start.py
+++ b/src/cadence_session_start.py
@@ -234,9 +234,9 @@ def printVersion():
elif arg == "--reset":
forceReset()
elif arg in ("--system-start", "--system-start-desktop"):
- sys.exit(startSession(True, arg == "--system-start-desktop"))
+ sys.exit(0 if startSession(True, arg == "--system-start-desktop") else 1)
elif arg in ("-s", "--s", "-start", "--start"):
- sys.exit(startSession(False, False))
+ sys.exit(0 if startSession(False, False) else 1)
elif arg in ("-h", "--h", "-help", "--help"):
printHelp(cmd)
elif arg in ("-v", "--v", "-version", "--version"):
From 3e6c9594d85cbcb947746e61dfa63a1928160f2e Mon Sep 17 00:00:00 2001
From: Markus <m.walther97@gmail.com>
Date: Sun, 31 May 2020 14:17:02 +0100
Subject: [PATCH] INSTALL.md: fix typo
---
INSTALL.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/INSTALL.md b/INSTALL.md
index 6668521b..1a572162 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -23,7 +23,7 @@ The required build dependencies are: <i>(devel packages of these)</i>
- PyQt5 (Py3 version)
On Debian and Ubuntu, use these commands to install all build dependencies: <br/>
-`$ sudo apt-get install libjack-jackd2-dev qtbase5-dev, qtbase5-dev-tools` <br/>
+`$ sudo apt-get install libjack-jackd2-dev qtbase5-dev qtbase5-dev-tools` <br/>
`$ sudo apt-get install python3-pyqt5 python3-pyqt5.qtsvg pyqt5-dev-tools`
To run all the apps/tools, you'll additionally need:
From c167f35fbb76c4246c730b29262a59da73010412 Mon Sep 17 00:00:00 2001
From: Alex Tsitsimpis <alex.tsitsimpis@gmail.com>
Date: Thu, 4 Jun 2020 12:49:40 +0300
Subject: [PATCH] Fix build with Qt 5.15+
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Building with Qt 5.15 failed with the following error:
../widgets/pixmapdial.cpp:231:26: error: aggregate ‘QPainterPath ballPath’ has incomplete type and cannot be defined
231 | QPainterPath ballPath;
| ^~~~~~~~
../widgets/pixmapdial.cpp:278:26: error: aggregate ‘QPainterPath ballPath’ has incomplete type and cannot be defined
278 | QPainterPath ballPath;
| ^~~~~~~~
Signed-off-by: Alex Tsitsimpis <alex.tsitsimpis@gmail.com>
---
c++/widgets/pixmapdial.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/c++/widgets/pixmapdial.cpp b/c++/widgets/pixmapdial.cpp
index 37dcffd7..0b5e0f51 100644
--- a/c++/widgets/pixmapdial.cpp
+++ b/c++/widgets/pixmapdial.cpp
@@ -22,6 +22,7 @@
#include <QtCore/QTimer>
#include <QtGui/QPainter>
#include <QtGui/QPaintEvent>
+#include <QtGui/QPainterPath>
PixmapDial::PixmapDial(QWidget* parent)
: QDial(parent),
