From 7d4f3d013158d5eddfc3040a3a00f6fb4ecc1074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Thu, 15 Dec 2022 13:53:42 +0100 Subject: [PATCH] boost: update to 1.81.0 --- mingw-w64-boost/PKGBUILD | 18 +++--------------- .../boost-1.73.0-fix-locale-icu.patch | 14 -------------- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 mingw-w64-boost/boost-1.73.0-fix-locale-icu.patch diff --git a/mingw-w64-boost/PKGBUILD b/mingw-w64-boost/PKGBUILD index d16a357e2c..de0b37fc81 100644 --- a/mingw-w64-boost/PKGBUILD +++ b/mingw-w64-boost/PKGBUILD @@ -6,9 +6,9 @@ _toolset=gcc _realname=boost pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.80.0 +pkgver=1.81.0 _boostver=${pkgver//./_} -pkgrel=2 +pkgrel=1 pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -34,19 +34,15 @@ source=(https://boostorg.jfrog.io/artifactory/main/release/${pkgver}/source/boos boost-1.57.0-python-abi_letters.patch boost-1.57.0-python-libpython_dep.patch boost-1.70.0-fix-python-install.patch - boost-1.73.0-fix-locale-icu.patch - boost-1.80.0-fix-building-with-libcxx-15.patch::https://github.com/boostorg/config/commit/f0af4a91.patch using-mingw-w64-python.patch msys2-mingw-folders-bootstrap.patch) -sha256sums=('1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0' +sha256sums=('71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa' 'b22196b6415f5e1c0fe56b49a12ea7c20073b15a5f31907f363c7be38d70d628' 'e322e7de83d92b80ebfba023127cbe05a18672234b09df9319767472401e01cc' 'c84cbb02321b4df379769f3a3cd03c38c76bdb13abaa3d3f04264ed37c99f2c7' 'cf46e9b791b45937d5af26b0f35dcdfa416cd9b62ef6c29e3064464835634628' '01758929643f92530512230d37df9793e6481cd6ce6310e3a79cee5ba287858c' '5e5fc9e04482903e1a0e7c6c4e81b57448b8dc86c707d1436d69ddc5010219ff' - '5ef2b1011dc960b7f55d4da89bcd75418eb696dce677b9fd0c78632f4109e7d3' - '973e559504c1c393572e189adeadde2fad54c65e9f813acf737c1097814d37eb' '5c38e08ba63695afa79a29d5d3ea22ef1ecf79f91d48ae922e1a489e83782742' '5117629ee577de0da800b6923675683ba69422cdbe958e70c9081fdc6886402e') @@ -86,13 +82,6 @@ prepare() { # Fix installation of both Python versions apply_patch_with_msg \ boost-1.70.0-fix-python-install.patch - - # Fix Boost::locale compilation to use ICU backend - apply_patch_with_msg \ - boost-1.73.0-fix-locale-icu.patch - - # https://github.com/boostorg/config/commit/f0af4a91 - patch -Np2 -i "${srcdir}"/boost-1.80.0-fix-building-with-libcxx-15.patch } setb2args() { @@ -125,7 +114,6 @@ setb2args() { --layout=tagged-1.66 \ --no-cmake-config \ -sHAVE_ICU=1 \ - -sICU_LINK=\"-L${MINGW_PREFIX}/lib -licuuc -licuin -licudt\" \ -sICU_PATH=${MINGW_PREFIX} \ -sICU_ICUUC_NAME=icuuc \ -sICU_ICUDT_NAME=icudt \ diff --git a/mingw-w64-boost/boost-1.73.0-fix-locale-icu.patch b/mingw-w64-boost/boost-1.73.0-fix-locale-icu.patch deleted file mode 100644 index 6d410db990..0000000000 --- a/mingw-w64-boost/boost-1.73.0-fix-locale-icu.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- boost_1_73_0/libs/regex/build/Jamfile.v2.orig 2020-04-22 16:35:55.000000000 +0300 -+++ boost_1_73_0/libs/regex/build/Jamfile.v2 2020-05-24 16:51:35.262191700 +0300 -@@ -33,11 +33,6 @@ - # - if ! $(disable-icu) - { -- if [ modules.peek : ICU_LINK ] -- { -- errors.user-error : "The ICU_LINK option is no longer supported by the Boost.Regex build - please refer to the documentation for equivalent options" ; -- } -- - if [ modules.peek : ICU_PATH ] - { - ICU_PATH = [ modules.peek : ICU_PATH ] ;