From 1bc2d8116f12940ff7c91dfe2afbc4c73f5e2d5c Mon Sep 17 00:00:00 2001 From: LIU Hao Date: Wed, 20 Aug 2025 03:32:15 +0800 Subject: [PATCH] boost: Upgrade to 1.89.0 (#25219) Signed-off-by: LIU Hao --- ...001-Fix-building-with-cmake-on-MINGW.patch | 34 +++++++++++-------- mingw-w64-boost/0004-fix-installing-dll.patch | 10 ++++++ mingw-w64-boost/PKGBUILD | 13 ++++--- 3 files changed, 38 insertions(+), 19 deletions(-) create mode 100644 mingw-w64-boost/0004-fix-installing-dll.patch diff --git a/mingw-w64-boost/0001-Fix-building-with-cmake-on-MINGW.patch b/mingw-w64-boost/0001-Fix-building-with-cmake-on-MINGW.patch index 32d4b4bd91..d61d88559d 100644 --- a/mingw-w64-boost/0001-Fix-building-with-cmake-on-MINGW.patch +++ b/mingw-w64-boost/0001-Fix-building-with-cmake-on-MINGW.patch @@ -1,15 +1,21 @@ ---- a/libs/cobalt/CMakeLists.txt -+++ b/libs/cobalt/CMakeLists.txt -@@ -60,6 +60,12 @@ - Boost::throw_exception - Boost::variant2 - ) -+ if(MINGW) -+ target_link_libraries(boost_cobalt -+ PRIVATE -+ ws2_32 -+ ) -+ endif() +diff -u -r boost-1.89.0.orig/libs/cobalt/CMakeLists.txt boost-1.89.0/libs/cobalt/CMakeLists.txt +--- boost-1.89.0.orig/libs/cobalt/CMakeLists.txt 2025-08-14 09:26:07.000000000 +0800 ++++ boost-1.89.0/libs/cobalt/CMakeLists.txt 2025-08-19 14:49:21.861899800 +0800 +@@ -73,7 +73,7 @@ + endif() - target_compile_definitions(boost_cobalt - PUBLIC BOOST_COBALT_NO_LIB=1 + if(MINGW OR CYGWIN) +- target_link_libraries(boost_cobalt PUBLIC ws2_32) ++ target_link_libraries(boost_cobalt PUBLIC ws2_32 mswsock bcrypt) + endif() + + if (BOOST_COBALT_USE_BOOST_CONTAINER) +@@ -210,7 +210,7 @@ + endif() + + if(MINGW OR CYGWIN) +- target_link_libraries(boost_cobalt PUBLIC ws2_32) ++ target_link_libraries(boost_cobalt PUBLIC ws2_32 mswsock bcrypt) + endif() + + if(BUILD_SHARED_LIBS) diff --git a/mingw-w64-boost/0004-fix-installing-dll.patch b/mingw-w64-boost/0004-fix-installing-dll.patch new file mode 100644 index 0000000000..b08b5e0e08 --- /dev/null +++ b/mingw-w64-boost/0004-fix-installing-dll.patch @@ -0,0 +1,10 @@ +diff -u -r boost-1.89.0.orig/libs/dll/CMakeLists.txt boost-1.89.0/libs/dll/CMakeLists.txt +--- boost-1.89.0.orig/libs/dll/CMakeLists.txt 2025-08-14 09:26:10.000000000 +0800 ++++ boost-1.89.0/libs/dll/CMakeLists.txt 2025-08-19 21:19:38.910074400 +0800 +@@ -57,3 +57,6 @@ + + endif() + ++install(DIRECTORY include/boost ++ DESTINATION include ++ FILES_MATCHING PATTERN "*.hpp") diff --git a/mingw-w64-boost/PKGBUILD b/mingw-w64-boost/PKGBUILD index d1957e5ca1..4e0c4f8db9 100644 --- a/mingw-w64-boost/PKGBUILD +++ b/mingw-w64-boost/PKGBUILD @@ -4,8 +4,8 @@ _realname=boost pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-libs") -pkgver=1.88.0 -pkgrel=2 +pkgver=1.89.0 +pkgrel=1 pkgdesc="Free peer-reviewed portable C++ source libraries" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -32,11 +32,13 @@ source=(https://github.com/boostorg/boost/releases/download/boost-${pkgver}/boos 0001-Fix-building-with-cmake-on-MINGW.patch 0002-No-Arch-in-library-name-tag.patch 0003-include-missing-cstdint.patch + 0004-fix-installing-dll.patch boost-1.63.0-python-test-PyImport_AppendInittab.patch) -sha256sums=('f48b48390380cfb94a629872346e3a81370dc498896f16019ade727ab72eb1ec' - 'c9ed544c7abe9e71587333cbecf73b89fe9815dd247a66407a06611c9de896cc' +sha256sums=('67acec02d0d118b5de9eb441f5fb707b3a1cdd884be00ca24b9a73c995511f74' + 'fb32ea452e02196552dae815eb44be5b18d849b0f6e24ecf5cf7be15e42ad85b' 'ee45d199c0e578a8d670ee6c6fa46466a53a02690c94f9221c67bbc9ab3387dc' 'fb575db0a68861f11e5bc788d8c0a172e7ffdb5569376eb848ca0f91670d6ec5' + 'b08150904cd3868971aaf8f0654056fd9c0a53fa84a88cdc2311ce37d15c18bb' 'b22196b6415f5e1c0fe56b49a12ea7c20073b15a5f31907f363c7be38d70d628') # Helper macros to help make tasks easier # @@ -58,7 +60,8 @@ prepare() { apply_patch_with_msg \ 0001-Fix-building-with-cmake-on-MINGW.patch \ 0002-No-Arch-in-library-name-tag.patch \ - 0003-include-missing-cstdint.patch + 0003-include-missing-cstdint.patch \ + 0004-fix-installing-dll.patch } build() {