From 5a82d1aab97f334074f7ca5707bac202db982f15 Mon Sep 17 00:00:00 2001 From: DeckerSU Date: Wed, 15 Nov 2023 18:33:11 +0100 Subject: [PATCH 1/2] fix value pools calculations https://github.com/KomodoPlatform/komodo/issues/604 --- configure.ac | 2 +- src/chain.h | 4 ++-- src/clientversion.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 84a3688ffff..4a99208dac3 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 8) define(_CLIENT_VERSION_REVISION, 1) -define(_CLIENT_VERSION_BUILD, 0) +define(_CLIENT_VERSION_BUILD, 2) define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) define(_CLIENT_VERSION_IS_RELEASE, true) diff --git a/src/chain.h b/src/chain.h index 6e2b19c47c8..56bedb0c04a 100644 --- a/src/chain.h +++ b/src/chain.h @@ -37,8 +37,8 @@ extern CCriticalSection cs_main; -static const int SPROUT_VALUE_VERSION = 1001400; -static const int SAPLING_VALUE_VERSION = 1010100; +static const int SPROUT_VALUE_VERSION = 80102; +static const int SAPLING_VALUE_VERSION = 80102; // These 5 are declared here to avoid circular dependencies // code used this moved into .cpp diff --git a/src/clientversion.h b/src/clientversion.h index 207e17c9d8d..95beac6e3b7 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -33,7 +33,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 8 #define CLIENT_VERSION_REVISION 1 -#define CLIENT_VERSION_BUILD 0 +#define CLIENT_VERSION_BUILD 2 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true From ac64a5bc9dde3b27178a1007bfdcd2cea67d581d Mon Sep 17 00:00:00 2001 From: DeckerSU Date: Thu, 16 Nov 2023 03:06:07 +0100 Subject: [PATCH 2/2] depends: patch boost to ignore -Wnonnull new gcc 11 warnings this patch fixes errors like: ``` include/boost/concept/detail/general.hpp:39:47: warning: 'this' pointer null [-Wnonnull] 39 | static void failed() { ((Model*)0)->~Model(); } ``` during build with gcc 11.x, more details can be found here: - https://github.com/boostorg/concept_check/issues/27 - https://github.com/boostorg/concept_check/pull/28 # Conflicts: # depends/packages/boost.mk --- depends/packages/boost.mk | 5 +- .../boost/ignore_wnonnull_gcc_11.patch | 68 +++++++++++++++++++ 2 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 depends/patches/boost/ignore_wnonnull_gcc_11.patch diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index 6f6c0c4b844..e671ea0e734 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -4,7 +4,7 @@ $(package)_version=1_72_0 $(package)_download_path=https://github.com/KomodoPlatform/boost/releases/download/boost-1.72.0-kmd $(package)_sha256_hash=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722 $(package)_file_name=$(package)_$($(package)_version).tar.bz2 -$(package)_patches=fix-Solaris.patch +$(package)_patches=fix-Solaris.patch ignore_wnonnull_gcc_11.patch define $(package)_set_vars $(package)_config_opts_release=variant=release @@ -29,7 +29,8 @@ endef define $(package)_preprocess_cmds echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : \"$($(package)_cxxflags) $($(package)_cppflags)\" \"$($(package)_ldflags)\" \"$(boost_archiver_$(host_os))\" \"$(host_STRIP)\" \"$(host_RANLIB)\" \"$(host_WINDRES)\" : ;" > user-config.jam&& \ - patch -p1 < $($(package)_patch_dir)/fix-Solaris.patch + patch -p1 < $($(package)_patch_dir)/fix-Solaris.patch &&\ + patch -p2 < $($(package)_patch_dir)/ignore_wnonnull_gcc_11.patch endef define $(package)_config_cmds diff --git a/depends/patches/boost/ignore_wnonnull_gcc_11.patch b/depends/patches/boost/ignore_wnonnull_gcc_11.patch new file mode 100644 index 00000000000..f914c1e6826 --- /dev/null +++ b/depends/patches/boost/ignore_wnonnull_gcc_11.patch @@ -0,0 +1,68 @@ +diff --git a/include/boost/concept/detail/general.hpp b/include/boost/concept/detail/general.hpp +index eeb08750..8d7d6f69 100644 +--- a/include/boost/concept/detail/general.hpp ++++ b/include/boost/concept/detail/general.hpp +@@ -28,7 +28,14 @@ namespace detail + template + struct requirement + { ++# if defined(BOOST_GCC) && (BOOST_GCC >= 110000) ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wnonnull" ++# endif + static void failed() { ((Model*)0)->~Model(); } ++# if defined(BOOST_GCC) && (BOOST_GCC >= 110000) ++# pragma GCC diagnostic pop ++# endif + }; + + struct failed {}; +@@ -36,7 +43,14 @@ struct failed {}; + template + struct requirement + { ++# if defined(BOOST_GCC) && (BOOST_GCC >= 110000) ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wnonnull" ++# endif + static void failed() { ((Model*)0)->~Model(); } ++# if defined(BOOST_GCC) && (BOOST_GCC >= 110000) ++# pragma GCC diagnostic pop ++# endif + }; + + # ifdef BOOST_OLD_CONCEPT_SUPPORT +@@ -44,7 +58,14 @@ struct requirement + template + struct constraint + { ++# if defined(BOOST_GCC) && (BOOST_GCC >= 110000) ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wnonnull" ++# endif + static void failed() { ((Model*)0)->constraints(); } ++# if defined(BOOST_GCC) && (BOOST_GCC >= 110000) ++# pragma GCC diagnostic pop ++# endif + }; + + template +diff --git a/include/boost/concept/usage.hpp b/include/boost/concept/usage.hpp +index 373de63a..fe88b5f5 100644 +--- a/include/boost/concept/usage.hpp ++++ b/include/boost/concept/usage.hpp +@@ -13,7 +13,14 @@ namespace boost { namespace concepts { + template + struct usage_requirements + { ++# if defined(BOOST_GCC) && (BOOST_GCC >= 110000) ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wnonnull" ++# endif + ~usage_requirements() { ((Model*)0)->~Model(); } ++# if defined(BOOST_GCC) && (BOOST_GCC >= 110000) ++# pragma GCC diagnostic pop ++# endif + }; + + # if BOOST_WORKAROUND(__GNUC__, <= 3)