On Fri Aug 13, 2021 at 03:31:41PM -0400, Brad Smith wrote: > Here is an update to Boost 1.77. > > https://www.boost.org/users/history/version_1_77_0.html > > Further review and testing is welcome. > > > The bulk build of beta1 showed the three following ports that > still need fixing. Any help there would be appreicated. > > net/bitcoin
diff --git a/net/bitcoin/Makefile b/net/bitcoin/Makefile index e33f9370a9c..6520c4b857f 100644 --- a/net/bitcoin/Makefile +++ b/net/bitcoin/Makefile @@ -7,6 +7,7 @@ COMMENT = P2P payment system GH_ACCOUNT = bitcoin GH_PROJECT = bitcoin GH_TAGNAME = v0.21.1 +REVISION = 0 SHARED_LIBS += bitcoinconsensus 4.0 # 0.0 SHARED_LIBS += secp256k1 0.1 # 0.0 @@ -59,11 +60,11 @@ CONFIGURE_ARGS += --without-gui .else WANTLIB += GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets X11 -WANTLIB += X11-xcb Xau Xdamage Xdmcp Xext Xfixes Xxf86vm crypto -WANTLIB += dbus-1 double-conversion drm execinfo expat freetype -WANTLIB += glapi glib-2.0 graphite2 gthread-2.0 harfbuzz iconv -WANTLIB += icudata icui18n icuuc intl miniupnpc pcre pcre2-16 -WANTLIB += png qrencode ssl xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present +WANTLIB += X11-xcb Xau Xdmcp Xext Xfixes Xxf86vm crypto dbus-1 +WANTLIB += double-conversion drm execinfo expat freetype glapi +WANTLIB += glib-2.0 graphite2 gthread-2.0 harfbuzz iconv icudata +WANTLIB += icui18n icuuc intl miniupnpc pcre pcre2-16 png qrencode +WANTLIB += ssl xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-shm WANTLIB += xcb-sync xcb-xfixes xshmfence zstd MODULES += x11/qt5 diff --git a/net/bitcoin/patches/patch-src_fs_cpp b/net/bitcoin/patches/patch-src_fs_cpp new file mode 100644 index 00000000000..0b75a1adf75 --- /dev/null +++ b/net/bitcoin/patches/patch-src_fs_cpp @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/fs.cpp +--- src/fs.cpp.orig ++++ src/fs.cpp +@@ -236,7 +236,7 @@ void ofstream::close() + } + #else // __GLIBCXX__ + +-static_assert(sizeof(*fs::path().BOOST_FILESYSTEM_C_STR) == sizeof(wchar_t), ++static_assert(sizeof(BOOST_FILESYSTEM_C_STR(*fs::path())) == sizeof(wchar_t), + "Warning: This build is using boost::filesystem ofstream and ifstream " + "implementations which will fail to open paths containing multibyte " + "characters. You should delete this static_assert to ignore this warning, " diff --git a/net/bitcoin/patches/patch-src_wallet_test_db_tests_cpp b/net/bitcoin/patches/patch-src_wallet_test_db_tests_cpp new file mode 100644 index 00000000000..87860ed1c69 --- /dev/null +++ b/net/bitcoin/patches/patch-src_wallet_test_db_tests_cpp @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/wallet/test/db_tests.cpp +--- src/wallet/test/db_tests.cpp.orig ++++ src/wallet/test/db_tests.cpp +@@ -18,7 +18,7 @@ BOOST_AUTO_TEST_CASE(getwalletenv_file) + std::string test_name = "test_name.dat"; + const fs::path datadir = GetDataDir(); + fs::path file_path = datadir / test_name; +- std::ofstream f(file_path.BOOST_FILESYSTEM_C_STR); ++ std::ofstream f(BOOST_FILESYSTEM_C_STR(file_path)); + f.close(); + + std::string filename; diff --git a/net/bitcoin/patches/patch-src_wallet_test_init_test_fixture_cpp b/net/bitcoin/patches/patch-src_wallet_test_init_test_fixture_cpp new file mode 100644 index 00000000000..d426dd023ca --- /dev/null +++ b/net/bitcoin/patches/patch-src_wallet_test_init_test_fixture_cpp @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/wallet/test/init_test_fixture.cpp +--- src/wallet/test/init_test_fixture.cpp.orig ++++ src/wallet/test/init_test_fixture.cpp +@@ -31,7 +31,7 @@ InitWalletDirTestingSetup::InitWalletDirTestingSetup(c + fs::create_directories(m_walletdir_path_cases["default"]); + fs::create_directories(m_walletdir_path_cases["custom"]); + fs::create_directories(m_walletdir_path_cases["relative"]); +- std::ofstream f(m_walletdir_path_cases["file"].BOOST_FILESYSTEM_C_STR); ++ std::ofstream f(BOOST_FILESYSTEM_C_STR(m_walletdir_path_cases["file"])); + f.close(); + } +
