From e38a42c14748503d49da0453f43325221ebe59e2 Mon Sep 17 00:00:00 2001 From: vgulkevic Date: Thu, 16 Jul 2020 09:55:23 +0300 Subject: [PATCH 1/2] Update makefile.osx build script --- doc/build-osx.md | 4 ++-- src/makefile.osx | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/build-osx.md b/doc/build-osx.md index 10affc2e..d1ff39c4 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -34,8 +34,8 @@ You can get the current version from http://developer.apple.com 1. Install dependencies: ``` brew install boost@1.59 - brew install berkeley-db4 - brew install miniupnpc@2.1 + brew install berkeley-db4 + brew install miniupnpc brew install https://github.com/tebelorg/Tump/releases/download/v1.0.0/openssl.rb brew install automake brew install autoconf diff --git a/src/makefile.osx b/src/makefile.osx index e3d410a9..99e637b7 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -50,6 +50,7 @@ LIBS += \ -l boost_thread-mt \ -l ssl \ -l crypto \ + -lsecp256k1 -lgmp \ -l z endif From 42317723a6df2275c5f663b23eb905051c47f937 Mon Sep 17 00:00:00 2001 From: vgulkevic Date: Fri, 17 Jul 2020 00:30:31 +0300 Subject: [PATCH 2/2] Add DigitalNote-qt instructions for macOS --- DigitalNote.pro | 18 +++++++++--------- doc/build-osx.md | 24 ++++++++++++++++++++++++ src/qt/trafficgraphwidget.cpp | 1 + 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/DigitalNote.pro b/DigitalNote.pro index d9cd9905..e28ffa82 100644 --- a/DigitalNote.pro +++ b/DigitalNote.pro @@ -530,7 +530,7 @@ isEmpty(BOOST_THREAD_LIB_SUFFIX) { } isEmpty(BDB_LIB_PATH) { - macx:BDB_LIB_PATH = /usr/local/Cellar/berkeley-db4/4.8.30/lib + macx:BDB_LIB_PATH = /usr/local/Cellar/berkeley-db@4/4.8.30/lib windows:BDB_LIB_PATH=C:/dev/coindeps32/bdb-4.8/lib } @@ -539,17 +539,17 @@ isEmpty(BDB_LIB_SUFFIX) { } isEmpty(BDB_INCLUDE_PATH) { - macx:BDB_INCLUDE_PATH = /usr/local/Cellar/berkeley-db4/4.8.30/include + macx:BDB_INCLUDE_PATH = /usr/local/Cellar/berkeley-db@4/4.8.30/include windows:BDB_INCLUDE_PATH=C:/dev/coindeps32/bdb-4.8/include } isEmpty(BOOST_LIB_PATH) { - macx:BOOST_LIB_PATH = /usr/local/Cellar/boost/1.59.0/lib + macx:BOOST_LIB_PATH = /usr/local/Cellar/boost@1.59/1.59.0/lib windows:BOOST_LIB_PATH=C:/dev/coindeps32/boost_1_57_0/lib } isEmpty(BOOST_INCLUDE_PATH) { - macx:BOOST_INCLUDE_PATH = /usr/local/Cellar/boost/1.59.0/include + macx:BOOST_INCLUDE_PATH = /usr/local/Cellar/boost@1.59/1.59.0/include windows:BOOST_INCLUDE_PATH=C:/dev/coindeps32/boost_1_57_0/include } @@ -568,22 +568,22 @@ isEmpty(MINIUPNPC_LIB_SUFFIX) { } isEmpty(MINIUPNPC_INCLUDE_PATH) { - macx:MINIUPNPC_INCLUDE_PATH=/usr/local/Cellar/miniupnpc/1.9.20151008/include + macx:MINIUPNPC_INCLUDE_PATH= /usr/local/Cellar/miniupnpc/2.1/include windows:MINIUPNPC_INCLUDE_PATH=C:/dev/coindeps32/miniupnpc-1.9 } isEmpty(MINIUPNPC_LIB_PATH) { - macx:MINIUPNPC_LIB_PATH=/usr/local/Cellar/miniupnpc/1.9.20151008/lib + macx:MINIUPNPC_LIB_PATH= /usr/local/Cellar/miniupnpc/2.1/lib windows:MINIUPNPC_LIB_PATH=C:/dev/coindeps32/miniupnpc-1.9 } isEmpty(OPENSSL_INCLUDE_PATH) { - macx:OPENSSL_INCLUDE_PATH = /usr/local/openssl-1.0.1p/include + macx:OPENSSL_INCLUDE_PATH = /usr/local/Cellar/openssl/1.0.2t/include windows:OPENSSL_INCLUDE_PATH=C:/dev/coindeps32/openssl-1.0.1p/include } isEmpty(OPENSSL_LIB_PATH) { - macx:OPENSSL_LIB_PATH = /usr/local/openssl-1.0.1p/lib + macx:OPENSSL_LIB_PATH = /usr/local/Cellar/openssl/1.0.2t/lib windows:OPENSSL_LIB_PATH=C:/dev/coindeps32/openssl-1.0.1p/lib } @@ -605,7 +605,7 @@ macx:HEADERS += src/qt/macdockiconhandler.h src/qt/macnotificationhandler.h macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm src/qt/macnotificationhandler.mm macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit -framework CoreServices macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0 -macx:ICON = src/qt/res/icons/bitcoin.icns +macx:ICON = src/qt/res/icons/digitalnote.icns macx:TARGET = "DigitalNote-Qt" macx:QMAKE_CFLAGS_THREAD += -pthread macx:QMAKE_LFLAGS_THREAD += -pthread diff --git a/doc/build-osx.md b/doc/build-osx.md index d1ff39c4..eee1f892 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -74,3 +74,27 @@ to start the DigitalNote daemon. Run `./DigitalNoted help` When the daemon is running, to get a list of RPC commands + + +DigitalNote-qt: Qt5 GUI Release for DigitalNote +----------------------------------------- + +1. Install dependencies: + ``` + brew install qrencode + brew install qt5 + brew install protobuf + brew install python2.7 + sudo easy_install appscript + ``` +2. Link qt5: + ``` + brew link qt5 --force + ``` +3. Run in the ./DigitalNote + ``` + qmake RELEASE=1 USE_UPNP=1 USE_QRCODE=1 DigitalNote.pro + make + python2.7 contrib/macdeploy/macdeployqtplus DigitalNote-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy contrib/macdeploy/fancy.plist + ``` + \ No newline at end of file diff --git a/src/qt/trafficgraphwidget.cpp b/src/qt/trafficgraphwidget.cpp index d49bc31f..46666a8b 100644 --- a/src/qt/trafficgraphwidget.cpp +++ b/src/qt/trafficgraphwidget.cpp @@ -2,6 +2,7 @@ #include "clientmodel.h" #include +#include #include #include