depends: boost: update to 1.85.0

diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk
index dd02ce9b05cee693b9154751ca32652802a9b5fb..83d3b4373da39342999e3f06f22be0d15bbc24c8 100644 (file)
--- a/contrib/depends/packages/boost.mk
+++ b/contrib/depends/packages/boost.mk
@@ -1,8 +1,8 @@
 package=boost
-$(package)_version=1.84.0
-$(package)_download_path=https://downloads.sourceforge.net/project/boost/boost/$($(package)_version)/
-$(package)_file_name=$(package)_$(subst .,_,$($(package)_version)).tar.bz2
-$(package)_sha256_hash=cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454
+$(package)_version=1.85.0
+$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$($(package)_version)/source/
+$(package)_file_name=$(package)_$(subst .,_,$($(package)_version)).tar.gz
+$(package)_sha256_hash=be0d91732d5b0cc6fbb275c7939974457e79b54d6f07ce2e3dfdd68bef883b0b
 $(package)_dependencies=libiconv
 $(package)_patches=disable_addr2line.patch
 

diff --git a/contrib/depends/patches/boost/disable_addr2line.patch b/contrib/depends/patches/boost/disable_addr2line.patch
index ad87b0097ca1e986c0e4ce5b349bb9642f9e88f6..4c4373d6daca0e2e82a3aeb6d45e6355097266a4 100644 (file)
--- a/contrib/depends/patches/boost/disable_addr2line.patch
+++ b/contrib/depends/patches/boost/disable_addr2line.patch
@@ -4,20 +4,20 @@ diff --git a/libs/stacktrace/build/Jamfile.v2 b/libs/stacktrace/build/Jamfile.v2
 index 230d5a8b4..d3d74599b 100644
 --- a/libs/stacktrace/build/Jamfile.v2
 +++ b/libs/stacktrace/build/Jamfile.v2
-@@ -42,9 +42,6 @@ rule mp-run-simple ( sources + : args * : input-files * : requirements * : targe
+@@ -48,9 +48,6 @@ rule mp-run-simple ( sources + : args * : input-files * : requirements * : targe
  mp-run-simple has_backtrace.cpp : : : <library>backtrace : libbacktrace ;
  explicit libbacktrace ;
- 
+
 -mp-run-simple has_addr2line.cpp : : : : addr2line ;
 -explicit addr2line ;
 -
  mp-run-simple has_windbg.cpp : : : <library>Dbgeng <library>ole32 : WinDbg ;
  explicit WinDbg ;
- 
-@@ -76,19 +73,6 @@ lib boost_stacktrace_backtrace
+
+@@ -82,19 +79,6 @@ lib boost_stacktrace_backtrace
      #<link>shared:<define>BOOST_STACKTRACE_DYN_LINK=1
    ;
- 
+
 -lib boost_stacktrace_addr2line
 -  : # sources
 -    ../src/addr2line.cpp
@@ -34,9 +34,9 @@ index 230d5a8b4..d3d74599b 100644
  lib boost_stacktrace_basic
    : # sources
      ../src/basic.cpp
-@@ -128,4 +112,4 @@ lib boost_stacktrace_windbg_cached
+@@ -152,4 +136,4 @@ lib boost_stacktrace_from_exception
      #<link>shared:<define>BOOST_STACKTRACE_DYN_LINK=1
    ;
- 
--boost-install boost_stacktrace_noop boost_stacktrace_backtrace boost_stacktrace_addr2line boost_stacktrace_basic boost_stacktrace_windbg boost_stacktrace_windbg_cached ;
-+boost-install boost_stacktrace_noop boost_stacktrace_backtrace boost_stacktrace_basic boost_stacktrace_windbg boost_stacktrace_windbg_cached ;
+
+-boost-install boost_stacktrace_noop boost_stacktrace_backtrace boost_stacktrace_addr2line boost_stacktrace_basic boost_stacktrace_windbg boost_stacktrace_windbg_cached boost_stacktrace_from_exception ;
++boost-install boost_stacktrace_noop boost_stacktrace_backtrace boost_stacktrace_basic boost_stacktrace_windbg boost_stacktrace_windbg_cached boost_stacktrace_from_exception ;

diff --git a/monero b/monero
index ad951be2edfb3045ec3d0bb74a25badb91bc8b92..5d4d1e8f6854baa894f738d373cfee79e6d4eba2 160000 (submodule)
--- a/monero
+++ b/monero
@@ -1 +1 @@
-Subproject commit ad951be2edfb3045ec3d0bb74a25badb91bc8b92
+Subproject commit 5d4d1e8f6854baa894f738d373cfee79e6d4eba2