diff --git a/mingw-w64-wt/005-include-missing-header.patch b/mingw-w64-wt/005-include-missing-header.patch new file mode 100644 index 0000000000..100d453205 --- /dev/null +++ b/mingw-w64-wt/005-include-missing-header.patch @@ -0,0 +1,10 @@ +--- a/src/Wt/Dbo/backend/Postgres.C ++++ b/src/Wt/Dbo/backend/Postgres.C +@@ -20,6 +20,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/mingw-w64-wt/PKGBUILD b/mingw-w64-wt/PKGBUILD index 8718b390c0..f72b1760c6 100644 --- a/mingw-w64-wt/PKGBUILD +++ b/mingw-w64-wt/PKGBUILD @@ -3,17 +3,19 @@ _realname=wt pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=4.10.0 +pkgver=4.10.3 pkgrel=1 pkgdesc="A C++ library and application server for developing and deploying web applications (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="http://www.webtoolkit.eu/" +msys2_repository_url="https://github.com/emweb/wt" license=('spdx:GPL-2.0-or-later') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-fontconfig" "${MINGW_PACKAGE_PREFIX}-glib2" + "${MINGW_PACKAGE_PREFIX}-glew" "${MINGW_PACKAGE_PREFIX}-graphicsmagick" "${MINGW_PACKAGE_PREFIX}-libharu" "${MINGW_PACKAGE_PREFIX}-openssl" @@ -24,7 +26,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-doxygen" "${MINGW_PACKAGE_PREFIX}-graphviz" - "${MINGW_PACKAGE_PREFIX}-glew" "${MINGW_PACKAGE_PREFIX}-asciidoc" "${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-python-pygments" @@ -36,41 +37,53 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" optdepends=("${MINGW_PACKAGE_PREFIX}-postgresql: for PostgreSQL Dbo support" "${MINGW_PACKAGE_PREFIX}-libmariadbclient: for MySQL Dbo support" "${MINGW_PACKAGE_PREFIX}-sqlite3: for Sqlite Dbo support") -source=("${_realname}-${pkgver}.tar.gz::https://github.com/emweb/wt/archive/${pkgver}.tar.gz" +source=("https://github.com/emweb/wt/archive/${pkgver}/${_realname}-${pkgver}.tar.gz" '001-wt-4.4.0-fix-find-gm.patch' '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') -sha512sums=('156ac130177f46151f8da8a8ce36714a7fd30713ac796c94867756309f7099f429e2e6e1c676f114079bc5fefd3b49ecb3a036f49779d7b6d3c6a64f190d0a50' - 'a585ca7c80ec4b05e88622fe98f97c3ee249dbe8a93bca611656d6a07fb36734c27691ebf5578b8adfa71b128466efc7f43513e265feab2b1942e80185555deb' - '1c03f218678286007b60b041381406187c81f6169e27777312ee92db5537847c975bec4739a01deffbdac7012e5fee764e3636a06fb68870aaa925849ea12568' - '82a0129dc7dfb103e61ae268572f5e4630fd2469f6a40778290dee0f3db65e50887b91ed9d7db8a6e50d6e162b3ed7ee286492952cd54d2518d344267bddcce7' - '6ee021f3f9fa207269bee69e06050ff93574e623c4d18521c876e175ad6bd122ff69863d34e89c96d2c07ed59907af3d2dfbcbb7c4c675157cf5a305b5d3e9b6') + '004-wt-4.4.0-disable-win32-examples-bat.patch' + '005-include-missing-header.patch') +sha256sums=('33f563d5eb79377f42c0955095545f36db6c9ad5528ed686d3f32a6b8c166204' + '8e42ec247e796117363d8cbfad7b36ba2e4387597f431adbc8846e4ae78d6610' + '0ff81e1ce798e0fb07ed37b099d91b120adb5e517ebaddf63892ecf991eeb8e3' + '746aaec5c34b1725514111a29376d5484cf7c9e23cc3d2f16e737f32c67211c6' + 'e0bcd9a9b5bff0e3b13cc49dc029d35ec36a42e61c0449ddee97b21d2c4e39a6' + '7c803f8506347a4d1e7fe47284ee21a2a7f52a0af657669c5b9314dbefaf11e0') + +apply_patch_with_msg() { + for _fname in "$@" + do + msg2 "Applying ${_fname}" + patch -Nbp1 -i "${srcdir}"/${_fname} + done +} prepare() { cd "${srcdir}/${_realname}-${pkgver}" - patch -p1 -i "${srcdir}/001-wt-4.4.0-fix-find-gm.patch" - patch -p1 -i "${srcdir}/002-wt-4.4.0-skip-some-examples.patch" - patch -p1 -i "${srcdir}/003-wt-4.4.0-disable-win32-configdir.patch" - patch -p1 -i "${srcdir}/004-wt-4.4.0-disable-win32-examples-bat.patch" + apply_patch_with_msg \ + 001-wt-4.4.0-fix-find-gm.patch \ + 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-include-missing-header.patch } build() { mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" - declare -a extra_config + declare -a _extra_config if check_option "debug" "n"; then - extra_config+=("-DCMAKE_BUILD_TYPE=Release") + _extra_config+=("-DCMAKE_BUILD_TYPE=Release") else - extra_config+=("-DCMAKE_BUILD_TYPE=Debug") + _extra_config+=("-DCMAKE_BUILD_TYPE=Debug") fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G"Ninja" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ - ${extra_config[@]} \ + "${_extra_config[@]}" \ -DCONNECTOR_HTTP=ON \ -DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick \ -DGM_PREFIX=${MINGW_PREFIX} \