diff --git a/meson/0001-cygwin-disguise.patch b/meson/0001-cygwin-disguise.patch index fe2ba3d8..076a351f 100644 --- a/meson/0001-cygwin-disguise.patch +++ b/meson/0001-cygwin-disguise.patch @@ -52,19 +52,6 @@ index 9bf6ef667..b99e9f246 100644 mlog.error('This python3 seems to be msys/python on MSYS2 Windows, which is known to have path semantics incompatible with Meson') msys2_arch = detect_msys2_arch() if msys2_arch: -diff --git a/run_unittests.py b/run_unittests.py -index c7c6ba265..c64c6af30 100755 ---- a/run_unittests.py -+++ b/run_unittests.py -@@ -1890,6 +1890,8 @@ class BasePlatformTests(unittest.TestCase): - base = os.path.splitext(filename)[0] - if base.startswith(('lib', 'cyg')): - return base[3:] -+ if base.startswith('msys-'): -+ return base[5:] - return base - - def assertBuildRelinkedOnlyTarget(self, target): -- 2.29.1 diff --git a/meson/PKGBUILD b/meson/PKGBUILD index e3277ce4..17fe33b8 100644 --- a/meson/PKGBUILD +++ b/meson/PKGBUILD @@ -12,7 +12,7 @@ source=("https://github.com/mesonbuild/${pkgname}/releases/download/${pkgver}/${ "0001-cygwin-disguise.patch") sha256sums=('64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921' 'SKIP' - 'd923909ef135520caaf09608651f13e5b3090911b228795cbf5376b55a587903') + 'e975a4416cb8c23521e702cef04cd60399728f6a7346da396cda6989d8b699b8') validpgpkeys=("19E2D6D9B46D8DAA6288F877C24E631BABB1FE70") # Jussi Pakkanen prepare() {