diff --git a/mingw-w64-crt-git/PKGBUILD b/mingw-w64-crt-git/PKGBUILD index e3e7d5a909..3ea33c72f9 100644 --- a/mingw-w64-crt-git/PKGBUILD +++ b/mingw-w64-crt-git/PKGBUILD @@ -4,7 +4,7 @@ _realname=crt pkgbase=mingw-w64-${_realname}-git pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" pkgver=12.0.0.r723.gad150be87 -pkgrel=1 +pkgrel=2 _commit='ad150be87e14159a82f3c8dce03c0c1e6263aee2' pkgdesc='MinGW-w64 CRT for Windows (mingw-w64)' arch=('any') @@ -22,9 +22,11 @@ provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") options=('!strip' '!buildflags' '!emptydirs') source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit" - 0001-crt-delayimp-Make-an-IAT-entry-writeable-before-modi.patch) + 0001-crt-delayimp-Make-an-IAT-entry-writeable-before-modi.patch + https://github.com/mingw-w64/mingw-w64/commit/07e34538d5a7d5e86ab47c7ba47becb32f7d827e.patch) sha256sums=('79ad9ccddaaf4873cad0123383c418219a461e4cc3fbbfeecdee15e8cd4a8e1f' - 'fcef8b83090c57ff897f471aeb0cd5a71d6385ff569eba8bbef0c424c21acda4') + 'fcef8b83090c57ff897f471aeb0cd5a71d6385ff569eba8bbef0c424c21acda4' + '96cfa6b44c14494a8d2a02ed3687cad57658188dfb90fe5f787d536cf69aa488') pkgver() { cd "${srcdir}/mingw-w64" @@ -34,6 +36,7 @@ pkgver() { prepare() { cd "${srcdir}/mingw-w64" patch -p1 -i "${srcdir}/0001-crt-delayimp-Make-an-IAT-entry-writeable-before-modi.patch" + git apply -R "${srcdir}/07e34538d5a7d5e86ab47c7ba47becb32f7d827e.patch" } build() { diff --git a/mingw-w64-headers-git/PKGBUILD b/mingw-w64-headers-git/PKGBUILD index 6f1cf14343..044fa40581 100644 --- a/mingw-w64-headers-git/PKGBUILD +++ b/mingw-w64-headers-git/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}-git pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" pkgdesc="MinGW-w64 headers for Windows (mingw-w64)" pkgver=12.0.0.r723.gad150be87 -pkgrel=1 +pkgrel=2 _commit='ad150be87e14159a82f3c8dce03c0c1e6263aee2' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -20,9 +20,11 @@ provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") options=('!strip' '!emptydirs') source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit" - 0001-remove-ireference-boolean.patch) + 0001-remove-ireference-boolean.patch + https://github.com/mingw-w64/mingw-w64/commit/07e34538d5a7d5e86ab47c7ba47becb32f7d827e.patch) sha256sums=('79ad9ccddaaf4873cad0123383c418219a461e4cc3fbbfeecdee15e8cd4a8e1f' - 'cad48616325b5e70afa4e02424021fc8d54e17dcbf86eae3df990d3500080236') + 'cad48616325b5e70afa4e02424021fc8d54e17dcbf86eae3df990d3500080236' + '96cfa6b44c14494a8d2a02ed3687cad57658188dfb90fe5f787d536cf69aa488') pkgver() { cd "${srcdir}/mingw-w64" @@ -32,6 +34,7 @@ pkgver() { prepare() { cd "${srcdir}/mingw-w64" git apply "${srcdir}/0001-remove-ireference-boolean.patch" + git apply -R "${srcdir}/07e34538d5a7d5e86ab47c7ba47becb32f7d827e.patch" } build() {