diff --git a/mingw-w64-wt/002-wt-4.4.0-skip-some-examples.patch b/mingw-w64-wt/002-wt-4.4.0-skip-some-examples.patch index dd9819b958..4df482b640 100644 --- a/mingw-w64-wt/002-wt-4.4.0-skip-some-examples.patch +++ b/mingw-w64-wt/002-wt-4.4.0-skip-some-examples.patch @@ -1,9 +1,9 @@ ---- wt-4.4.0-orig/examples/CMakeLists.txt 2020-08-03 12:46:02.000000000 +0300 -+++ wt-4.4.0/examples/CMakeLists.txt 2020-12-10 09:42:47.094156500 +0300 -@@ -242,7 +242,7 @@ - ENDMACRO(WT_ADD_EXAMPLE) +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -244,7 +244,7 @@ SUBDIRS( + authentication - blog + #blog charts diff --git a/mingw-w64-wt/005-fix-build-against-boost-1.85.patch b/mingw-w64-wt/005-fix-build-against-boost-1.85.patch deleted file mode 100644 index 3776e26ccf..0000000000 --- a/mingw-w64-wt/005-fix-build-against-boost-1.85.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/src/http/Server.C -+++ b/src/http/Server.C -@@ -331,8 +331,8 @@ std::vector Server::resolveAddress(asio::ip::tcp::resolver &r - LOG_DEBUG_S(&wt_, "Failed to resolve hostname \"" << address << "\" as IPv4: " << - Wt::AsioWrapper::system_error(errc).what()); - // Resolve IPv6 -- query = Wt::AsioWrapper::asio::ip::tcp::resolver::query(Wt::AsioWrapper::asio::ip::tcp::v6(), address, "http"); -- for (Wt::AsioWrapper::asio::ip::tcp::resolver::iterator it = resolver.resolve(query, errc); -+ asio::ip::tcp::resolver::query query_v6(asio::ip::tcp::v6(), address, "http"); -+ for (asio::ip::tcp::resolver::iterator it = resolver.resolve(query_v6, errc); - !errc && it != end; ++it) { - result.push_back(it->endpoint().address()); - } ---- a/src/web/FileUtils.C -+++ b/src/web/FileUtils.C -@@ -8,6 +8,7 @@ - #include "web/FileUtils.h" - - #include -+#include - - #include "web/WebUtils.h" - #include "Wt/WException.h" diff --git a/mingw-w64-wt/PKGBUILD b/mingw-w64-wt/PKGBUILD index cc55b06d39..04d91a4700 100644 --- a/mingw-w64-wt/PKGBUILD +++ b/mingw-w64-wt/PKGBUILD @@ -3,8 +3,8 @@ _realname=wt pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=4.10.4 -pkgrel=4 +pkgver=4.11.1 +pkgrel=1 pkgdesc="A C++ library and application server for developing and deploying web applications (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -44,13 +44,13 @@ source=("${msys2_repository_url}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz '002-wt-4.4.0-skip-some-examples.patch' '003-wt-4.4.0-disable-win32-configdir.patch' '004-wt-4.4.0-disable-win32-examples-bat.patch' - '005-fix-build-against-boost-1.85.patch') -sha256sums=('dd6092abe599d9254242225e801da38085847b3147c1748e1212f274398a2e9a' + '005-fix-build-with-boost-1.87.patch::https://github.com/emweb/wt/commit/f39d3a00.patch') +sha256sums=('c255b7d6b0569a9c67282ef7a89af9624e3ab79477924e5a110814a570d1d017' '8e42ec247e796117363d8cbfad7b36ba2e4387597f431adbc8846e4ae78d6610' - '0ff81e1ce798e0fb07ed37b099d91b120adb5e517ebaddf63892ecf991eeb8e3' + '325181981bd46cca61592e501448717b0451be167ad8e3e46ba84ec2cdd42574' '746aaec5c34b1725514111a29376d5484cf7c9e23cc3d2f16e737f32c67211c6' 'e0bcd9a9b5bff0e3b13cc49dc029d35ec36a42e61c0449ddee97b21d2c4e39a6' - '72e48debf256b3b53b48881bc0551e1ccf62d390b268f932566d42c75896daf1') + '993a99571ab23a8078dd301e09cedc0da13aa3d27d9e5b819d31b7d0653ac3a8') apply_patch_with_msg() { for _fname in "$@" @@ -68,7 +68,9 @@ prepare() { 002-wt-4.4.0-skip-some-examples.patch \ 003-wt-4.4.0-disable-win32-configdir.patch \ 004-wt-4.4.0-disable-win32-examples-bat.patch \ - 005-fix-build-against-boost-1.85.patch + 005-fix-build-with-boost-1.87.patch + + find . -name "*.orig" -exec rm -f {} \; } build() { @@ -116,5 +118,6 @@ package() { sed -e "s|${MINGW_PREFIX}|\$\{_IMPORT_PREFIX\}|g" -i ${_f} done - install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" + install -Dm644 "${srcdir}"/${_realname}-${pkgver}/LICENSE \ + "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE }