Merge pull request #57 from lukem512/patch-1

Add support for miniupnpc 1.9

doc/readme-qt.rst

@@ -26,7 +26,7 @@ for Ubuntu >= 12.04 (please read the 'Berkely DB version warning' below):
 
     apt-get install qt4-qmake libqt4-dev build-essential libboost-dev libboost-system-dev \
         libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev \
-        libssl-dev libdb++-dev libminiupnpc-dev crypto++
+        libssl-dev libdb++-dev libminiupnpc-dev libcrypto++-dev
 
 then execute the following:
 

maxcoin-qt.pro

@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = maxcoin-qt
 macx:TARGET = "MaxCoin-Qt"
-VERSION = 0.9.4.0
+VERSION = 0.9.4.1
 INCLUDEPATH += src src/json src/qt
 QT += network
 DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
@@ -450,7 +450,7 @@ macx:QMAKE_INFO_PLIST = share/qt/Info.plist
 # Set libraries and includes at end, to use platform-defined defaults if not overridden
 INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH
 LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
-LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX ./src/cryptopp/libcryptopp.a
+LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX $$PWD/src/cryptopp/libcryptopp.a
 # -lgdi32 has to happen after -lcrypto (see  #681)
 win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
 LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX

src/clientversion.h

@@ -9,14 +9,14 @@
 #define CLIENT_VERSION_MAJOR       0
 #define CLIENT_VERSION_MINOR       9
 #define CLIENT_VERSION_REVISION    4
-#define CLIENT_VERSION_BUILD       0
+#define CLIENT_VERSION_BUILD       1
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true
 
 // Copyright year (2009-this)
 // Todo: update this when changing our copyright comments in the source
-#define COPYRIGHT_YEAR 2017
+#define COPYRIGHT_YEAR 2018
 
 // Converts the parameter X to a string after macro replacement on X has been performed.
 // Don't merge these into one macro!

src/cryptopp/GNUmakefile

@@ -1,7 +1,7 @@
 CXXFLAGS = -DNDEBUG -g -O2 -Wno-unused-variable -Wno-unused-function -Wno-extra -Wno-type-limits
 # -O3 fails to link on Cygwin GCC version 4.5.3
 # -fPIC is supported. Please report any breakage of -fPIC as a bug.
-# CXXFLAGS += -fPIC
+  CXXFLAGS += -fPIC
 # the following options reduce code size, but breaks link or makes link very slow on some systems
 # CXXFLAGS += -ffunction-sections -fdata-sections
 # LDFLAGS += -Wl,--gc-sections

src/makefile.unix

@@ -51,7 +51,7 @@ ifndef USE_UPNP
 	override USE_UPNP = -
 endif
 ifneq (${USE_UPNP}, -)
-	LIBS += /usr/lib/libminiupnpc.a
+	LIBS += /usr/lib/x86_64-linux-gnu/libminiupnpc.a
 	DEFS += -DUSE_UPNP=$(USE_UPNP)
 endif
 

src/net.cpp

@@ -1195,8 +1195,8 @@ void MapPort(bool)
 // The first name is used as information source for addrman.
 // The second name should resolve to a list of seed addresses.
 static const char *strMainNetDNSSeed[][3] = {
-    {"maxcoinhub.io", "dnsseed.maxcoinhub.io"},
-    {"maxcoin.org.uk", "dnsseed.maxcoin.org.uk"},
+    {"Seed A", "a.seed.maxcoinproject.net"},
+    {"Seed B", "b.seed.maxcoinproject.net"},
     {NULL, NULL}
 };
 

src/qt/aboutdialog.cpp

@@ -13,7 +13,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
     // Set current copyright year
     ui->copyrightLabel->setText(
         tr("Copyright") + QString(" &copy; 2009-2017 ") + tr("The Bitcoin developers") + QString(",<br>") +
-        tr("Copyright") + QString(" &copy; 2017 ")/*.arg(COPYRIGHT_YEAR)*/ + tr("The MaxCoin developers"));
+        tr("Copyright") + QString(" &copy; 2018 ")/*.arg(COPYRIGHT_YEAR)*/ + tr("The MaxCoin Project developers"));
 }
 
 void AboutDialog::setModel(ClientModel *model)

src/qt/bitcoingui.cpp

@@ -323,7 +323,7 @@ void BitcoinGUI::createToolBars()
     toolbar->addAction(receiveCoinsAction);
     toolbar->addAction(historyAction);
     toolbar->addAction(addressBookAction);
-    toolbar->addAction(miningAction);
+    //toolbar->addAction(miningAction);
 }
 
 void BitcoinGUI::setClientModel(ClientModel *clientModel)

src/qt/forms/aboutdialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>593</width>
-    <height>350</height>
+    <width>650</width>
+    <height>450</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -63,7 +63,7 @@
           <cursorShape>IBeamCursor</cursorShape>
          </property>
          <property name="text">
-          <string notr="true">0.3.666-beta</string>
+          <string notr="true">0.9.4.1</string>
          </property>
          <property name="textInteractionFlags">
           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -91,7 +91,7 @@
         <cursorShape>IBeamCursor</cursorShape>
        </property>
        <property name="text">
-        <string notr="true">Copyright &amp;copy; 2009-2014 The Bitcoin developers, 2017 The MaxCoin developers</string>
+        <string notr="true">Copyright &amp;copy; 2009-2014 The Bitcoin developers, 2018 The MaxCoin developers</string>
        </property>
        <property name="textFormat">
         <enum>Qt::RichText</enum>

src/rpcrawtransaction.cpp

@@ -238,7 +238,7 @@ Value listunspent(const Array& params, bool fHelp)
             CTxDestination address;
             if (ExtractDestination(pk, address))
             {
-                const CScriptID& hash = boost::get<const CScriptID&>(address);
+                const CScriptID& hash = boost::get<CScriptID>(address);
                 CScript redeemScript;
                 if (pwalletMain->GetCScript(hash, redeemScript))
                     entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end())));

src/version.cpp

@@ -11,7 +11,7 @@
 const std::string CLIENT_NAME("Max");
 
 // Client version number
-#define CLIENT_VERSION_SUFFIX   "-beta"
+#define CLIENT_VERSION_SUFFIX   ""
 
 
 // The following part of the code determines the CLIENT_BUILD variable.