From 3b2c73113e74fbb7b506e115d508ee908a3a3831 Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Thu, 28 May 2020 14:56:47 -0400 Subject: [PATCH 1/2] Add missing QPainterPath include This is needed to compile with Qt 5.15. --- src/qt/trafficgraphwidget.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qt/trafficgraphwidget.cpp b/src/qt/trafficgraphwidget.cpp index 601d554c0..ff0084533 100644 --- a/src/qt/trafficgraphwidget.cpp +++ b/src/qt/trafficgraphwidget.cpp @@ -6,6 +6,7 @@ #include "clientmodel.h" #include +#include #include #include From 51cc2791a7104970000ffae5b9a99cb722ca73d9 Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Wed, 4 Nov 2020 09:59:36 +0100 Subject: [PATCH 2/2] macOS deploy: use the new plistlib API See https://docs.python.org/3/library/plistlib.html. The new API was added in 3.4 and old removed in 3.9. --- contrib/macdeploy/macdeployqtplus | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index da18e2f84..e673b8e18 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -552,7 +552,8 @@ if len(config.fancy) == 1: sys.exit(1) try: - fancy = plistlib.readPlist(p) + with open(p, 'rb') as fp: + fancy = plistlib.load(fp, fmt=plistlib.FMT_XML) except: if verbose >= 1: sys.stderr.write("Error: Could not parse fancy disk image plist at \"%s\"\n" % (p))