summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2020-08-17 19:03:18 +0200
committer Matteo Bernardini2021-02-27 08:20:25 +0100
commitaa3021a5a97082bc39ec37a52c9d7c47a7bc76a9 (patch)
tree9ff20b6a4bab8a2637c3714045d98260669617cc
parent9aa1498acb0841d4ce656319a4de5cc157b4e2ed (diff)
downloadslackbuilds-Gridcoin-Research.tar.gz
academic/Gridcoin-Research: Patched for boost >= 1.73.0.Gridcoin-Research
...and for qt5-5.15.x Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--academic/Gridcoin-Research/Gridcoin-Research.SlackBuild6
-rw-r--r--academic/Gridcoin-Research/boost-1.73.patch54
2 files changed, 60 insertions, 0 deletions
diff --git a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
index b1a80a48e4..73ab6e425d 100644
--- a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
+++ b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
@@ -70,6 +70,12 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# For boost >= 1.73.0
+patch -p1 < $CWD/boost-1.73.patch
+
+# For qt-5.15.x, thanks to kingbeowulf!
+sed -i '/^#include <QPainter>$/a #include <QPainterPath>' src/qt/trafficgraphwidget.cpp
+
if [ "${QRENC:-no}" = "yes" ]; then
useqr="--with-qrencode"
else
diff --git a/academic/Gridcoin-Research/boost-1.73.patch b/academic/Gridcoin-Research/boost-1.73.patch
new file mode 100644
index 0000000000..d47fe78a6e
--- /dev/null
+++ b/academic/Gridcoin-Research/boost-1.73.patch
@@ -0,0 +1,54 @@
+diff -Naur Gridcoin-Research-4.0.6.0.orig/src/qt/clientmodel.cpp Gridcoin-Research-4.0.6.0/src/qt/clientmodel.cpp
+--- Gridcoin-Research-4.0.6.0.orig/src/qt/clientmodel.cpp 2019-10-22 20:36:49.000000000 +0200
++++ Gridcoin-Research-4.0.6.0/src/qt/clientmodel.cpp 2020-05-12 08:45:16.926818550 +0200
+@@ -270,9 +270,9 @@
+ // Connect signals to client
+ uiInterface.NotifyBlocksChanged.connect(boost::bind(NotifyBlocksChanged, this));
+ uiInterface.BannedListChanged.connect(boost::bind(BannedListChanged, this));
+- uiInterface.NotifyNumConnectionsChanged.connect(boost::bind(NotifyNumConnectionsChanged, this, _1));
+- uiInterface.NotifyAlertChanged.connect(boost::bind(NotifyAlertChanged, this, _1, _2));
+- uiInterface.NotifyScraperEvent.connect(boost::bind(NotifyScraperEvent, this, _1, _2, _3));
++ uiInterface.NotifyNumConnectionsChanged.connect(boost::bind(NotifyNumConnectionsChanged, this, boost::placeholders::_1));
++ uiInterface.NotifyAlertChanged.connect(boost::bind(NotifyAlertChanged, this, boost::placeholders::_1, boost::placeholders::_2));
++ uiInterface.NotifyScraperEvent.connect(boost::bind(NotifyScraperEvent, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3));
+ }
+
+ void ClientModel::unsubscribeFromCoreSignals()
+@@ -280,7 +280,7 @@
+ // Disconnect signals from client
+ uiInterface.NotifyBlocksChanged.disconnect(boost::bind(NotifyBlocksChanged, this));
+ uiInterface.BannedListChanged.disconnect(boost::bind(BannedListChanged, this));
+- uiInterface.NotifyNumConnectionsChanged.disconnect(boost::bind(NotifyNumConnectionsChanged, this, _1));
+- uiInterface.NotifyAlertChanged.disconnect(boost::bind(NotifyAlertChanged, this, _1, _2));
+- uiInterface.NotifyScraperEvent.disconnect(boost::bind(NotifyScraperEvent, this, _1, _2, _3));
++ uiInterface.NotifyNumConnectionsChanged.disconnect(boost::bind(NotifyNumConnectionsChanged, this, boost::placeholders::_1));
++ uiInterface.NotifyAlertChanged.disconnect(boost::bind(NotifyAlertChanged, this, boost::placeholders::_1, boost::placeholders::_2));
++ uiInterface.NotifyScraperEvent.disconnect(boost::bind(NotifyScraperEvent, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3));
+ }
+diff -Naur Gridcoin-Research-4.0.6.0.orig/src/qt/walletmodel.cpp Gridcoin-Research-4.0.6.0/src/qt/walletmodel.cpp
+--- Gridcoin-Research-4.0.6.0.orig/src/qt/walletmodel.cpp 2019-10-22 20:36:49.000000000 +0200
++++ Gridcoin-Research-4.0.6.0/src/qt/walletmodel.cpp 2020-05-12 08:47:46.494818550 +0200
+@@ -369,17 +369,17 @@
+ void WalletModel::subscribeToCoreSignals()
+ {
+ // Connect signals to wallet
+- wallet->NotifyStatusChanged.connect(boost::bind(&NotifyKeyStoreStatusChanged, this, _1));
+- wallet->NotifyAddressBookChanged.connect(boost::bind(NotifyAddressBookChanged, this, _1, _2, _3, _4, _5));
+- wallet->NotifyTransactionChanged.connect(boost::bind(NotifyTransactionChanged, this, _1, _2, _3));
++ wallet->NotifyStatusChanged.connect(boost::bind(&NotifyKeyStoreStatusChanged, this, boost::placeholders::_1));
++ wallet->NotifyAddressBookChanged.connect(boost::bind(NotifyAddressBookChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5));
++ wallet->NotifyTransactionChanged.connect(boost::bind(NotifyTransactionChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3));
+ }
+
+ void WalletModel::unsubscribeFromCoreSignals()
+ {
+ // Disconnect signals from wallet
+- wallet->NotifyStatusChanged.disconnect(boost::bind(&NotifyKeyStoreStatusChanged, this, _1));
+- wallet->NotifyAddressBookChanged.disconnect(boost::bind(NotifyAddressBookChanged, this, _1, _2, _3, _4, _5));
+- wallet->NotifyTransactionChanged.disconnect(boost::bind(NotifyTransactionChanged, this, _1, _2, _3));
++ wallet->NotifyStatusChanged.disconnect(boost::bind(&NotifyKeyStoreStatusChanged, this, boost::placeholders::_1));
++ wallet->NotifyAddressBookChanged.disconnect(boost::bind(NotifyAddressBookChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5));
++ wallet->NotifyTransactionChanged.disconnect(boost::bind(NotifyTransactionChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3));
+ }
+
+ // WalletModel::UnlockContext implementation