4 files changed, 6 insertions, 68 deletions
diff --git a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
index 62a2a10eae3e..89063eb0560f 100644
--- a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
+++ b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
@@ -70,13 +70,7 @@ 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
+if [ "${QRENC:-yes}" = "yes" ]; then
   useqr="--with-qrencode"
 else
   useqr="--without-qrencode"
diff --git a/academic/Gridcoin-Research/Gridcoin-Research.info b/academic/Gridcoin-Research/Gridcoin-Research.info
index a3675fa047cd..dd8477dc7634 100644
--- a/academic/Gridcoin-Research/Gridcoin-Research.info
+++ b/academic/Gridcoin-Research/Gridcoin-Research.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+EMAIL="kingbeowulf@linuxgalaxy.org"
diff --git a/academic/Gridcoin-Research/README b/academic/Gridcoin-Research/README
index 50b5c427ed77..308e5898d0d6 100644
--- a/academic/Gridcoin-Research/README
+++ b/academic/Gridcoin-Research/README
@@ -3,16 +3,14 @@ rewards volunteer computing performed on the BOINC platform. BOINC is
 an open source volunteer computing grid which combines the processing
 power of individual users for the purposes of scientific research.
 
-qrencode and miniupnpc are optional (available on SBo) to build QR and
-UPnP support.  To enable them run the script as
+qrencode support is detected automatically; override with
+  QRENC=no ./Gridcoin-Research.SlackBuild
 
-QRENC=yes ./Gridcoin-Research.SlackBuild
-UPNP=yes ./Gridcoin-Research.SlackBuild
+Miniupnpc (available on SBo) is optional for UPnP support. Run script as
+  UPNP=yes ./Gridcoin-Research.SlackBuild
 
 You will need to edit the configuration file gridcoinresearch.conf
 in /etc/Gridcoin-Research/ and place it in your home directory
 ~/.GridcoinResearch/ to provide the location of your boinc data
 and any other configurations that you require. For details, see
 https://wiki.gridcoin.us/Gridcoinresearch_config_file
-
-**NOTE: Recommended Leisure update**
diff --git a/academic/Gridcoin-Research/boost-1.73.patch b/academic/Gridcoin-Research/boost-1.73.patch
deleted file mode 100644
index d47fe78a6e66..000000000000
--- a/academic/Gridcoin-Research/boost-1.73.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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