From 041ef3cd43087b08b77ea76db576e6c22325a314 Mon Sep 17 00:00:00 2001 From: kth5 Date: Tue, 5 Dec 2023 21:15:02 +0100 Subject: [PATCH] * update meson to 1.3.0-1 --- meson/0001-Skip-broken-tests.patch | 6 +++--- meson/PKGBUILD | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/meson/0001-Skip-broken-tests.patch b/meson/0001-Skip-broken-tests.patch index 0acf1cff5f..4309175751 100644 --- a/meson/0001-Skip-broken-tests.patch +++ b/meson/0001-Skip-broken-tests.patch @@ -35,10 +35,10 @@ index f612e1d52d6d..d0e0d079a069 100644 dep = dependency('ZLIB', version : '>=1.2', method : 'cmake') diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py -index 1899cb48ccc6..0f1094243a5c 100644 +index 4fcf52e09f2c..6e07c450aa0a 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py -@@ -359,6 +359,7 @@ class LinuxlikeTests(BasePlatformTests): +@@ -360,6 +360,7 @@ class LinuxlikeTests(BasePlatformTests): raise SkipTest('asan not available on Cygwin') if is_openbsd(): raise SkipTest('-fsanitize=address is not supported on OpenBSD') @@ -46,7 +46,7 @@ index 1899cb48ccc6..0f1094243a5c 100644 testdir = os.path.join(self.framework_test_dir, '7 gnome') self.init(testdir, extra_args=['-Db_sanitize=address', '-Db_lundef=false']) -@@ -1024,6 +1025,7 @@ class LinuxlikeTests(BasePlatformTests): +@@ -1030,6 +1031,7 @@ class LinuxlikeTests(BasePlatformTests): raise SkipTest('asan not available on Cygwin') if is_openbsd(): raise SkipTest('-fsanitize=address is not supported on OpenBSD') diff --git a/meson/PKGBUILD b/meson/PKGBUILD index 7ba7e4085b..2b5672dfe0 100644 --- a/meson/PKGBUILD +++ b/meson/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Anatol Pomozov pkgname=meson -pkgver=1.2.3 +pkgver=1.3.0 pkgrel=1 pkgdesc="High productivity build system" url="https://mesonbuild.com/" @@ -31,6 +31,7 @@ checkdepends=( gcc-fortran gcc-objc git + glibc-locales gmock gnustep-base gobject-introspection @@ -76,14 +77,14 @@ source=( 0001-Skip-broken-tests.patch 0002-Use-C-17-for-protobuf-tests.patch ) -b2sums=('7d76c54bddba249ab97ebd5dd0afc448177ff9fa70812a8ca0cc9fe308c9b145b3fbc3ee068acae0fdc73edff42134b7a0b618cd80a05347a424aca7bc8bbef8' +b2sums=('cb9ac8e00fe924df67166938687584a9de35e784e1e52bff281649d787695d37e3044ea3d6d5869181fe1e9676b5136548293dbd5cdbd091a6de0c449b8932f5' 'SKIP' - 'e08aca9bb2f72276f43d52ae254a39216ba2e1fa7568d929ec9286aa341c995b207c9f82e2bcbe9f1de656d38ac7c7bbb3d97ae54aa294e341d39d2e521b842a' - 'a60fdc7d2fedfdd505338369d75c89dc07ae35bd563d0f3aecaed60b25982c8a9874f29e331a135363be6c145833bc0edf32ef3c2b89a563cd25906509eb86e7' + '553cdd8e165593a50570777f0e862a8e20d15dc5b7262c32ca8c86c54c8f2ee1b759be3439e9eec5917c88b3275d755b4f072e979dab400edf18908cb9fbf68e' + 'f50c3569c6330e8671c402953247fb456505dd75555c8fbf1487bd43881dcdc766d88348814a6c2bb631c571ad4c4efabb271b5a1e7f01748ae2d9a332b39330' '211cee61f117fd1d582d7a613a8634f044e9e307791c4154c6da72bccd5f06856801b14bcb26157ee682b5935c48ffd2098a5fabab2232726d7758cf091c07f7' 'e56c75dd9122d866e8a92381f1f8a3fa268451d13a18b73906c0089601d3e6edf28602b36f40d8a32758e9958a167a1bdccd70283581e19b2ed39863640daf95' '7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e' - 'e178221d00456dcfd5b04d2df7c23a9d19108e210f834fa42350dbdc5f90206a0143178fe6e8b145ac28cd1c335b5dacac8ea408f3bf5f51aa46d46a5e77505a' + '21466907b450c662824f576accbf49d4bb543c5d7a1075dfcd48e89db92537d2dbe194a55c335bd520f787125b83b394a9f9f2b9e16d667797dc34c3b862bf60' 'c0154434fefb00aebb66b276c3b871b9ec629adc8f3c5b020a21b4662667c0bdaa2c48c6a7498d0c7ab901bb9c3911bd0bb82fbae5e5f3ae2da006e3849e0ff0') validpgpkeys=( 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 # Jussi Pakkanen