From c3ba26ff9a00835602bea2da05a8fce4eb8f056f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 17 Dec 2024 17:22:41 +0100 Subject: [PATCH] meson: Update to 1.6.1 removed patch is included now --- mingw-w64-meson/PKGBUILD | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/mingw-w64-meson/PKGBUILD b/mingw-w64-meson/PKGBUILD index eb7ae52a86715..029dd57656c24 100644 --- a/mingw-w64-meson/PKGBUILD +++ b/mingw-w64-meson/PKGBUILD @@ -3,8 +3,8 @@ _realname=meson pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.6.0 -pkgrel=3 +pkgver=1.6.1 +pkgrel=1 pkgdesc="High-productivity build system (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -31,15 +31,13 @@ source=("https://github.com/mesonbuild/${_realname}/releases/download/${pkgver}/ '0002-Default-to-sys.prefix-as-the-default-prefix.patch' '0004-fix-gtk-doc.patch' 'install-man.patch' - "https://patch-diff.githubusercontent.com/raw/mesonbuild/meson/pull/12861.patch" - "https://github.com/mesonbuild/meson/commit/b131b2dc76ff0b14d755b1a3bbf7ce9565f49b0d.patch") -sha256sums=('999b65f21c03541cf11365489c1fad22e2418bb0c3d50ca61139f2eec09d5496' + "https://patch-diff.githubusercontent.com/raw/mesonbuild/meson/pull/12861.patch") +sha256sums=('1eca49eb6c26d58bbee67fd3337d8ef557c0804e30a6d16bfdf269db997464de' '5805aed0a117536eb16dd8eef978c6be57c2471b655ede63e25517c28b4f4cf0' '032b38f0b2765dc88e1fcb34e27b69b611e07c869c13c6e703bcf182e586fccb' '0f9177102976bbcbdf50c1da49842783a0c77be939e839f1bf91dcaba6a5cdee' '0682a36cb75e545a78b81293303835a16171f25baf949905dc08029436efff84' - '999e0751148bd47c4496509210618cdba5e7baeb2601fbf810a88fc193bd0378' - 'cea131f81247fe783ecd4657cd8f98f00884248d088a7fc5383e4ef2a3361e9a') + '999e0751148bd47c4496509210618cdba5e7baeb2601fbf810a88fc193bd0378') apply_patch_with_msg() { for _patch in "$@" @@ -60,9 +58,6 @@ prepare() { # https://github.com/mesonbuild/meson/pull/12861 apply_patch_with_msg 12861.patch - - # support autolib field for Cargo subprojects - apply_patch_with_msg b131b2dc76ff0b14d755b1a3bbf7ce9565f49b0d.patch } build() {