Merge remote-tracking branch 'origin/v1.2.2.1'

# Conflicts:
#	depends/packages/qt.mk

contrib/cmake/FindBerkeleyDB.cmake

@@ -0,0 +1,146 @@
+# Author: sum01 <sum01@protonmail.com>
+# Git: https://github.com/sum01/FindBerkeleyDB
+# Read the README.md for the full info.
+
+# Allow user to pass a path instead of guessing
+if(BerkeleyDB_ROOT_DIR)
+    set(_BERKELEYDB_PATHS "${BerkeleyDB_ROOT_DIR}")
+elseif(CMAKE_SYSTEM_NAME MATCHES ".*[wW]indows.*")
+    # MATCHES is used to work on any devies with windows in the name
+    # Shameless copy-paste from FindOpenSSL.cmake v3.8
+    file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
+    list(APPEND _BERKELEYDB_HINTS "${_programfiles}")
+
+    # There's actually production release and version numbers in the file path.
+    # For example, if they're on v6.2.32: C:/Program Files/Oracle/Berkeley DB 12cR1 6.2.32/
+    # But this still works to find it, so I'm guessing it can accept partial path matches.
+
+    foreach(_TARGET_BERKELEYDB_PATH "Oracle/Berkeley DB" "Berkeley DB")
+        list(APPEND _BERKELEYDB_PATHS
+                "${_programfiles}/${_TARGET_BERKELEYDB_PATH}"
+                "C:/Program Files (x86)/${_TARGET_BERKELEYDB_PATH}"
+                "C:/Program Files/${_TARGET_BERKELEYDB_PATH}"
+                "C:/${_TARGET_BERKELEYDB_PATH}"
+                )
+    endforeach()
+else()
+    # Paths for anything other than Windows
+    # Cellar/berkeley-db is for macOS from homebrew installation
+    list(APPEND _BERKELEYDB_PATHS
+            "/usr/local/Cellar/berkeley-db@4"
+            "/usr/local/Cellar/berkeley-db"
+            "/opt"
+            "/opt/local"
+            "/usr/local"
+            )
+endif()
+
+# Find includes path
+find_path(BerkeleyDB_INCLUDE_DIRS
+        db_cxx.h
+        PATHS "${_BERKELEYDB_PATHS}"
+        PATH_SUFFIXES "include" "includes"
+        )
+
+# Checks if the version file exists, save the version file to a var, and fail if there's no version file
+if(BerkeleyDB_INCLUDE_DIRS)
+    # Read the version file db.h into a variable
+    file(READ "${BerkeleyDB_INCLUDE_DIRS}/db.h" _BERKELEYDB_DB_HEADER)
+    # Parse the DB version into variables to be used in the lib names
+    string(REGEX REPLACE ".*DB_VERSION_MAJOR	([0-9]+).*" "\\1" BerkeleyDB_VERSION_MAJOR "${_BERKELEYDB_DB_HEADER}")
+    string(REGEX REPLACE ".*DB_VERSION_MINOR	([0-9]+).*" "\\1" BerkeleyDB_VERSION_MINOR "${_BERKELEYDB_DB_HEADER}")
+    # Patch version example on non-crypto installs: x.x.xNC
+    string(REGEX REPLACE ".*DB_VERSION_PATCH	([0-9]+(NC)?).*" "\\1" BerkeleyDB_VERSION_PATCH "${_BERKELEYDB_DB_HEADER}")
+else()
+    if(BerkeleyDB_FIND_REQUIRED)
+        # If the find_package(BerkeleyDB REQUIRED) was used, fail since we couldn't find the header
+        message(FATAL_ERROR "Failed to find Berkeley DB's header file \"db.h\"! Try setting \"BerkeleyDB_ROOT_DIR\" when initiating Cmake.")
+    elseif(NOT BerkeleyDB_FIND_QUIETLY)
+        message(WARNING "Failed to find Berkeley DB's header file \"db.h\"! Try setting \"BerkeleyDB_ROOT_DIR\" when initiating Cmake.")
+    endif()
+    # Set some garbage values to the versions since we didn't find a file to read
+    set(BerkeleyDB_VERSION_MAJOR "0")
+    set(BerkeleyDB_VERSION_MINOR "0")
+    set(BerkeleyDB_VERSION_PATCH "0")
+endif()
+
+# The actual returned/output version variable (the others can be used if needed)
+set(BerkeleyDB_VERSION "${BerkeleyDB_VERSION_MAJOR}.${BerkeleyDB_VERSION_MINOR}.${BerkeleyDB_VERSION_PATCH}")
+
+# Finds the target library for berkeley db, since they all follow the same naming conventions
+macro(findpackage_berkeleydb_get_lib _BERKELEYDB_OUTPUT_VARNAME _TARGET_BERKELEYDB_LIB)
+    # Different systems sometimes have a version in the lib name...
+    # and some have a dash or underscore before the versions.
+    # CMake recommends to put unversioned names before versioned names
+    find_library(${_BERKELEYDB_OUTPUT_VARNAME}
+            NAMES
+            "${_TARGET_BERKELEYDB_LIB}"
+            "lib${_TARGET_BERKELEYDB_LIB}"
+            "lib${_TARGET_BERKELEYDB_LIB}${BerkeleyDB_VERSION_MAJOR}.${BerkeleyDB_VERSION_MINOR}"
+            "lib${_TARGET_BERKELEYDB_LIB}-${BerkeleyDB_VERSION_MAJOR}.${BerkeleyDB_VERSION_MINOR}"
+            "lib${_TARGET_BERKELEYDB_LIB}_${BerkeleyDB_VERSION_MAJOR}.${BerkeleyDB_VERSION_MINOR}"
+            "lib${_TARGET_BERKELEYDB_LIB}${BerkeleyDB_VERSION_MAJOR}${BerkeleyDB_VERSION_MINOR}"
+            "lib${_TARGET_BERKELEYDB_LIB}-${BerkeleyDB_VERSION_MAJOR}${BerkeleyDB_VERSION_MINOR}"
+            "lib${_TARGET_BERKELEYDB_LIB}_${BerkeleyDB_VERSION_MAJOR}${BerkeleyDB_VERSION_MINOR}"
+            "lib${_TARGET_BERKELEYDB_LIB}${BerkeleyDB_VERSION_MAJOR}"
+            "lib${_TARGET_BERKELEYDB_LIB}-${BerkeleyDB_VERSION_MAJOR}"
+            "lib${_TARGET_BERKELEYDB_LIB}_${BerkeleyDB_VERSION_MAJOR}"
+            HINTS ${_BERKELEYDB_HINTS}
+            PATH_SUFFIXES "lib" "lib64" "libs" "libs64"
+            PATHS ${_BERKELEYDB_PATHS}
+            )
+    # If the library was found, add it to our list of libraries
+    if(${_BERKELEYDB_OUTPUT_VARNAME})
+        # If found, append to our libraries variable
+        # The ${{}} is because the first expands to target the real variable, the second expands the variable's contents...
+        # and the real variable's contents is the path to the lib. Thus, it appends the path of the lib to BerkeleyDB_LIBRARIES.
+        list(APPEND BerkeleyDB_LIBRARIES "${${_BERKELEYDB_OUTPUT_VARNAME}}")
+    endif()
+endmacro()
+
+# Find and set the paths of the specific library to the variable
+findpackage_berkeleydb_get_lib(BerkeleyDB_LIBRARY "db")
+# NOTE: Windows doesn't have a db_cxx lib, but instead compiles the cxx code into the "db" lib
+findpackage_berkeleydb_get_lib(BerkeleyDB_Cxx_LIBRARY "db_cxx")
+# NOTE: I don't think Linux/Unix gets an SQL lib
+findpackage_berkeleydb_get_lib(BerkeleyDB_Sql_LIBRARY "db_sql")
+findpackage_berkeleydb_get_lib(BerkeleyDB_Stl_LIBRARY "db_stl")
+
+# Needed for find_package_handle_standard_args()
+include(FindPackageHandleStandardArgs)
+# Fails if required vars aren't found, or if the version doesn't meet specifications.
+find_package_handle_standard_args(BerkeleyDB
+        FOUND_VAR BerkeleyDB_FOUND
+        REQUIRED_VARS
+        BerkeleyDB_INCLUDE_DIRS
+        BerkeleyDB_LIBRARY
+        VERSION_VAR BerkeleyDB_VERSION
+        )
+
+# Create an imported lib for easy linking by external projects
+if(BerkeleyDB_FOUND AND BerkeleyDB_LIBRARIES AND NOT TARGET Oracle::BerkeleyDB)
+    add_library(Oracle::BerkeleyDB UNKNOWN IMPORTED)
+    set_target_properties(Oracle::BerkeleyDB PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${BerkeleyDB_INCLUDE_DIRS}"
+            IMPORTED_LOCATION "${BerkeleyDB_LIBRARY}"
+            INTERFACE_LINK_LIBRARIES "${BerkeleyDB_LIBRARIES}"
+            )
+endif()
+
+# Only show the includes path and libraries in the GUI if they click "advanced".
+# Does nothing when using the CLI
+mark_as_advanced(FORCE
+        BerkeleyDB_INCLUDE_DIRS
+        BerkeleyDB_LIBRARIES
+        BerkeleyDB_LIBRARY
+        BerkeleyDB_Cxx_LIBRARY
+        BerkeleyDB_Sql_LIBRARY
+        BerkeleyDB_Stl_LIBRARY
+        )
+
+include(FindPackageMessage)
+# A message that tells the user what includes/libs were found, and obeys the QUIET command.
+find_package_message(BerkeleyDB
+        "Found BerkeleyDB libraries: ${BerkeleyDB_LIBRARIES}"
+        "[${BerkeleyDB_LIBRARIES}[${BerkeleyDB_INCLUDE_DIRS}]]"
+        )

contrib/cmake/FindGMP.cmake

@@ -0,0 +1,33 @@
+# - Find GMP
+# This module defines
+# GMP_INCLUDE_DIR, where to find GMP headers
+# GMP_LIBRARY, LibEvent libraries
+# GMP_FOUND, If false, do not try to use GMP
+
+set(GMP_PREFIX "" CACHE PATH "path ")
+
+find_path(GMP_INCLUDE_DIR gmp.h gmpxx.h
+        PATHS ${GMP_PREFIX}/include /usr/include /usr/local/include )
+
+find_library(GMP_LIBRARY NAMES gmp libgmp
+        PATHS ${GMP_PREFIX}/lib /usr/lib /usr/local/lib)
+
+if(GMP_INCLUDE_DIR AND GMP_LIBRARY)
+    get_filename_component(GMP_LIBRARY_DIR ${GMP_LIBRARY} PATH)
+    set(GMP_FOUND TRUE)
+endif()
+
+if(GMP_FOUND)
+    if(NOT GMP_FIND_QUIETLY)
+        MESSAGE(STATUS "Found GMP: ${GMP_LIBRARY}")
+    endif()
+elseif(GMP_FOUND)
+    if(GMP_FIND_REQUIRED)
+        message(FATAL_ERROR "Could not find GMP")
+    endif()
+endif()
+
+mark_as_advanced(
+        GMP_LIB
+        GMP_INCLUDE_DIR
+)

contrib/cmake/FindLibEvent.cmake

@@ -0,0 +1,46 @@
+# - Find LibEvent (a cross event library)
+# This module defines
+# LIBEVENT_INCLUDE_DIR, where to find LibEvent headers
+# LIBEVENT_LIB, LibEvent libraries
+# LibEvent_FOUND, If false, do not try to use libevent
+
+if($ENV{target} MATCHES "Windows")
+    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/depends/$ENV{triple}")
+        set(LIBEVENT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/depends/$ENV{triple}/include")
+        set(LIBEVENT_LIB "${CMAKE_CURRENT_SOURCE_DIR}/depends/$ENV{triple}/lib/libevent.a")
+        set(LIBEVENT_PTHREAD_LIB "${CMAKE_CURRENT_SOURCE_DIR}/depends/$ENV{triple}/lib/libevent.a")
+    endif()
+else()
+    set(LibEvent_EXTRA_PREFIXES /usr/local /opt/local "$ENV{HOME}")
+    foreach(prefix ${LibEvent_EXTRA_PREFIXES})
+        list(APPEND LibEvent_INCLUDE_PATHS  "${prefix}/include")
+        list(APPEND LibEvent_LIB_PATHS "${prefix}/lib")
+    endforeach()
+
+    find_path(LIBEVENT_INCLUDE_DIR event.h PATHS ${LibEvent_INCLUDE_PATHS})
+    find_library(LIBEVENT_LIB NAMES event PATHS ${LibEvent_LIB_PATHS})
+    find_library(LIBEVENT_PTHREAD_LIB NAMES event_pthreads PATHS ${LibEvent_LIB_PATHS})
+endif()
+
+if (LIBEVENT_LIB AND LIBEVENT_INCLUDE_DIR AND LIBEVENT_PTHREAD_LIB)
+    set(LibEvent_FOUND TRUE)
+    set(LIBEVENT_LIB ${LIBEVENT_LIB} ${LIBEVENT_PTHREAD_LIB})
+else ()
+    set(LibEvent_FOUND FALSE)
+endif ()
+
+if (LibEvent_FOUND)
+    if (NOT LibEvent_FIND_QUIETLY)
+        message(STATUS "Found libevent: ${LIBEVENT_LIB}")
+    endif ()
+else ()
+    if (LibEvent_FIND_REQUIRED)
+        message(FATAL_ERROR "Could NOT find libevent and libevent_pthread.")
+    endif ()
+    message(STATUS "libevent and libevent_pthread NOT found.")
+endif ()
+
+mark_as_advanced(
+        LIBEVENT_LIB
+        LIBEVENT_INCLUDE_DIR
+)

contrib/cmake/FindMiniupnp.cmake

@@ -0,0 +1,33 @@
+# - Find Miniupnp
+# This module defines
+# MINIUPNP_INCLUDE_DIR, where to find Miniupnp headers
+# MINIUPNP_LIBRARY, Miniupnp libraries
+# MINIUPNP_FOUND, If false, do not try to use Miniupnp
+
+set(MINIUPNP_PREFIX "" CACHE PATH "path ")
+
+find_path(MINIUPNP_INCLUDE_DIR miniupnpc/miniupnpc.h
+        PATHS ${MINIUPNP_PREFIX}/include /usr/include /usr/local/include )
+
+find_library(MINIUPNP_LIBRARY NAMES miniupnpc libminiupnpc
+        PATHS ${MINIUPNP_PREFIX}/lib /usr/lib /usr/local/lib)
+
+if(MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY)
+    get_filename_component(MINIUPNP_LIBRARY_DIR ${MINIUPNP_LIBRARY} PATH)
+    set(MINIUPNP_FOUND TRUE)
+endif()
+
+if(MINIUPNP_FOUND)
+    if(NOT Miniupnp_FIND_QUIETLY)
+        MESSAGE(STATUS "Found Miniupnp: ${MINIUPNP_LIBRARY}")
+    endif()
+else()
+    if(MINIUPNP_FIND_REQUIRED)
+        message(FATAL_ERROR "Could not find Miniupnp")
+    endif()
+endif()
+
+mark_as_advanced(
+        MINIUPNP_LIBRARY
+        MINIUPNP_INCLUDE_DIR
+)

contrib/cmake/FindQrcode.cmake

@@ -0,0 +1,37 @@
+# - Find Qrcode
+# This module defines
+# QRCODE_INCLUDE_DIR, where to find libqrencode headers
+# QRCODE_LIB, libqrencode libraries
+# QRCODE_FOUND, If false, do not try to use libqrencode
+
+set(QRCODE_EXTRA_PREFIXES /usr/local /opt/local "$ENV{HOME}")
+foreach(prefix ${ZMQ_EXTRA_PREFIXES})
+    list(APPEND QRCODE_INCLUDE_PATHS "${prefix}/include")
+    list(APPEND QRCODE_LIB_PATHS "${prefix}/lib")
+endforeach()
+
+find_path(QRCODE_INCLUDE_DIR qrencode.h PATHS ${QRCODE_INCLUDE_PATHS})
+find_library(QRCODE_LIB NAMES qrencode PATHS ${QRCODE_LIB_PATHS})
+
+if (QRCODE_LIB AND QRCODE_INCLUDE_DIR)
+    set(QRCODE_FOUND TRUE)
+else ()
+    set(QRCODE_FOUND FALSE)
+endif ()
+
+if (QRCODE_FOUND)
+    if (NOT QRCODE_FIND_QUIETLY)
+        message(STATUS "Found libqrencode: ${QRCODE_LIB}")
+        include_directories(${QRCODE_INCLUDE_DIR})
+    endif ()
+else ()
+    if (QRCODE_FIND_REQUIRED)
+        message(FATAL_ERROR "Could NOT find libqrencode.")
+    endif ()
+    message(STATUS "libqrencode NOT found.")
+endif ()
+
+mark_as_advanced(
+        QRCODE_LIB
+        QRCODE_INCLUDE_DIR
+)

contrib/cmake/FindZMQ.cmake

@@ -0,0 +1,37 @@
+# - Find ZeroMQ
+# This module defines
+# ZMQ_INCLUDE_DIR, where to find ZMQ headers
+# ZMQ_LIB, ZMQ libraries
+# ZMQ_FOUND, If false, do not try to use ZeroMQ
+
+set(ZMQ_EXTRA_PREFIXES /usr/local /opt/local "$ENV{HOME}")
+foreach(prefix ${ZMQ_EXTRA_PREFIXES})
+    list(APPEND ZMQ_INCLUDE_PATHS "${prefix}/include")
+    list(APPEND ZMQ_LIB_PATHS "${prefix}/lib")
+endforeach()
+
+find_path(ZMQ_INCLUDE_DIR zmq.h PATHS ${ZMQ_INCLUDE_PATHS})
+find_library(ZMQ_LIB NAMES zmq PATHS ${ZMQ_LIB_PATHS})
+
+if (ZMQ_LIB AND ZMQ_INCLUDE_DIR)
+    set(ZMQ_FOUND TRUE)
+else ()
+    set(ZMQ_FOUND FALSE)
+endif ()
+
+if (ZMQ_FOUND)
+    if (NOT ZMQ_FIND_QUIETLY)
+        message(STATUS "Found ZeroMQ: ${ZMQ_LIB}")
+        include_directories(${ZMQ_INCLUDE_DIR})
+    endif ()
+else ()
+    if (ZMQ_FIND_REQUIRED)
+        message(FATAL_ERROR "Could NOT find ZeroMQ.")
+    endif ()
+    message(STATUS "ZeroMQ NOT found.")
+endif ()
+
+mark_as_advanced(
+        ZMQ_LIB
+        ZMQ_INCLUDE_DIR
+)

contrib/debian/README.md

@@ -14,7 +14,7 @@ To install:
 	sudo update-desktop-database
 
 If you build yourself, you will either need to modify the paths in
-the .desktop file or copy or symlink your helixqt binary to `/usr/bin`
+the .desktop file or copy or symlink your helix-qt binary to `/usr/bin`
 and the `../../share/pixmaps/helix128.png` to `/usr/share/pixmaps`
 
 helix-qt.protocol (KDE)