Merge pull request #60 from koh-gt/v-3.1.4-2024

v-3.1.4
koh-gt · Feb 8, 2024 · a6a567f · a6a567f
2 parents 9e40ae7 + a4d2d6f
commit a6a567f
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 11 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,11 +1,11 @@
 AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 3)
 define(_CLIENT_VERSION_MINOR, 1)
-define(_CLIENT_VERSION_REVISION, 3)
+define(_CLIENT_VERSION_REVISION, 4)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2023)
+define(_COPYRIGHT_YEAR, 2024)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Ferrite Core]])
 AC_INIT([Ferrite Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.comkoh-gt/ferrite/issues],[ferrite],[https://www.ferritecoin.org/])

diff --git a/depends/packages/fontconfig.mk b/depends/packages/fontconfig.mk
@@ -1,8 +1,8 @@
 package=fontconfig
-$(package)_version=2.12.1
+$(package)_version=2.12.6
 $(package)_download_path=https://www.freedesktop.org/software/fontconfig/release/
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
-$(package)_sha256_hash=b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3
+$(package)_sha256_hash=cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
 $(package)_dependencies=freetype expat
 $(package)_patches=remove_char_width_usage.patch gperf_header_regen.patch
 

diff --git a/depends/packages/zlib.mk b/depends/packages/zlib.mk
@@ -1,8 +1,8 @@
 package=zlib
-$(package)_version=1.2.11
+$(package)_version=1.3.1
 $(package)_download_path=https://www.zlib.net
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+$(package)_sha256_hash=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
 
 define $(package)_set_vars
 $(package)_config_opts= CC="$($(package)_cc)"
@@ -28,4 +28,3 @@ endef
 define $(package)_stage_cmds
   $(MAKE) DESTDIR=$($(package)_staging_dir) install
 endef
-
diff --git a/doc/build-unix.md b/doc/build-unix.md
@@ -38,6 +38,14 @@ make install # optional
 
 This will build ferrite-qt as well, if the dependencies are met.
 
+Known Issues:
+```
+src/qt/bitcoin.cpp:461: undefined reference to `qInitResources_bitcoin()'
+collect2: error: ld returned 1 exit status
+
+touch src/qt/bitcoin.qrc
+```
+
 Dependencies
 ---------------------
 

diff --git a/src/qt/res/icons/fext_letter.png b/src/qt/res/icons/fext_letter.png
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
@@ -329,7 +329,12 @@ bool SendCoinsDialog::PrepareSendText(QString& question_string, QString& informa
         {
             if(rcp.label.length() > 0) // label with address
             {
-                recipientElement.append(tr("%1 to '%2'").arg(amount, GUIUtil::HtmlEscape(rcp.label)));
+                QString displayedLabel = rcp.label;
+                if (rcp.label.length() > CHARACTERS_DISPLAY_LIMIT_IN_LABEL)  
+                {
+                    displayedLabel = displayedLabel.left(CHARACTERS_DISPLAY_LIMIT_IN_LABEL).append("..."); // limit the amount of characters displayed in label
+                }
+                recipientElement = tr("%1 to %2").arg(amount, GUIUtil::HtmlEscape(displayedLabel));
                 recipientElement.append(QString(" (%1)").arg(address));
             }
             else // just address

diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h
@@ -111,7 +111,8 @@ private Q_SLOTS:
 };
 
 
-#define SEND_CONFIRM_DELAY   3
+#define SEND_CONFIRM_DELAY   2
+#define CHARACTERS_DISPLAY_LIMIT_IN_LABEL 45
 
 class SendConfirmationDialog : public QMessageBox
 {

diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp
@@ -4,6 +4,7 @@
 
 #include <support/lockedpool.h>
 #include <support/cleanse.h>
+#include <stdexcept>
 
 #if defined(HAVE_CONFIG_H)
 #include <config/bitcoin-config.h>

diff --git a/src/support/lockedpool.h b/src/support/lockedpool.h
@@ -5,11 +5,12 @@
 #ifndef BITCOIN_SUPPORT_LOCKEDPOOL_H
 #define BITCOIN_SUPPORT_LOCKEDPOOL_H
 
-#include <stdint.h>
 #include <list>
 #include <map>
-#include <mutex>
 #include <memory>
+#include <mutex>
+#include <stdexcept>
+#include <stdint.h>
 #include <unordered_map>
 
 /**

diff --git a/src/util/bip32.h b/src/util/bip32.h
@@ -6,6 +6,7 @@
 #define BITCOIN_UTIL_BIP32_H
 
 #include <attributes.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 

diff --git a/src/util/string.h b/src/util/string.h
@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <array>
 #include <cstring>
+#include <cstdint>
 #include <locale>
 #include <sstream>
 #include <string>