From 9c842471fd6a2913bb463bca47af8da868a6cccc Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 22 Oct 2021 15:21:15 +0200 Subject: [PATCH] libtorrent-rasterbar: include the patch --- mingw-w64-libtorrent-rasterbar/PKGBUILD | 5 ++-- .../boost1_77.patch | 26 +++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 mingw-w64-libtorrent-rasterbar/boost1_77.patch diff --git a/mingw-w64-libtorrent-rasterbar/PKGBUILD b/mingw-w64-libtorrent-rasterbar/PKGBUILD index ba824c82f2..54bfbb41ae 100644 --- a/mingw-w64-libtorrent-rasterbar/PKGBUILD +++ b/mingw-w64-libtorrent-rasterbar/PKGBUILD @@ -7,7 +7,7 @@ _realname=libtorrent-rasterbar pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="libtorrent is a feature complete C++ bittorrent implementation focusing on efficiency and scalability (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -23,13 +23,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") options=('staticlibs' 'strip') source=("https://github.com/arvidn/libtorrent/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz" - "boost1_77.patch::https://github.com/arvidn/libtorrent/commit/c7e044871bdcc7483dd5fccbcb1b64bfcd91dd6d.patch") + "boost1_77.patch") sha256sums=('55bcce16c4b85b8cccd20e7ff4a9fde92db66333a25d6504a83c0bb0a5f7f529' 'd40bc034b95067cc50a5caa3afc71ea453e27cc058c3dd78c0a0ad694f626ba3') prepare() { cd "${srcdir}/${_realname}-${pkgver}" + # https://github.com/arvidn/libtorrent/commit/c7e044871bdcc7483dd patch -Np1 -i "$srcdir/boost1_77.patch" } diff --git a/mingw-w64-libtorrent-rasterbar/boost1_77.patch b/mingw-w64-libtorrent-rasterbar/boost1_77.patch new file mode 100644 index 0000000000..9298398705 --- /dev/null +++ b/mingw-w64-libtorrent-rasterbar/boost1_77.patch @@ -0,0 +1,26 @@ +From c7e044871bdcc7483dd5fccbcb1b64bfcd91dd6d Mon Sep 17 00:00:00 2001 +From: arvidn +Date: Mon, 23 Aug 2021 13:35:20 +0200 +Subject: [PATCH] fix for building with boost-1.77 on windows + +--- + include/libtorrent/aux_/allocating_handler.hpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/libtorrent/aux_/allocating_handler.hpp b/include/libtorrent/aux_/allocating_handler.hpp +index b24349850e8..726032e085c 100644 +--- a/include/libtorrent/aux_/allocating_handler.hpp ++++ b/include/libtorrent/aux_/allocating_handler.hpp +@@ -79,9 +79,9 @@ namespace libtorrent { namespace aux { + + constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + 102 + 8 * sizeof(void*); + constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + 102 + 8 * sizeof(void*); +- constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 128 + 8 * sizeof(void*); +- constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 152 + 8 * sizeof(void*); +- constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 144; ++ constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 144 + 8 * sizeof(void*); ++ constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 168 + 8 * sizeof(void*); ++ constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 160; + constexpr std::size_t abort_handler_max_size = tracking + debug_tick + 104; + constexpr std::size_t submit_handler_max_size = tracking + debug_tick + 104; + constexpr std::size_t deferred_handler_max_size = tracking + debug_tick + 112;