diff --git a/extra/meson/0001-Skip-broken-tests.patch b/extra/meson/0001-Skip-broken-tests.patch index 34c7a1bc7..c29f2147f 100644 --- a/extra/meson/0001-Skip-broken-tests.patch +++ b/extra/meson/0001-Skip-broken-tests.patch @@ -35,7 +35,7 @@ index 193ad184b637..e94ba68ac30f 100644 dep = dependency('ZLIB', version : '>=1.2', method : 'cmake') diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py -index 373887401f0d..12741c557fbc 100644 +index b5c9b4ee3146..089ef385f584 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -359,6 +359,7 @@ class LinuxlikeTests(BasePlatformTests): diff --git a/extra/meson/0002-Use-C-17-for-protobuf-tests.patch b/extra/meson/0002-Use-C-17-for-protobuf-tests.patch index 881b5579d..701234d02 100644 --- a/extra/meson/0002-Use-C-17-for-protobuf-tests.patch +++ b/extra/meson/0002-Use-C-17-for-protobuf-tests.patch @@ -9,11 +9,11 @@ Recent protobuf no longer supports C++11. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test cases/frameworks/5 protocol buffers/meson.build b/test cases/frameworks/5 protocol buffers/meson.build -index 046847a89297..f9e677c95f8f 100644 +index 9a4154b652f3..f9e677c95f8f 100644 --- a/test cases/frameworks/5 protocol buffers/meson.build +++ b/test cases/frameworks/5 protocol buffers/meson.build @@ -1,4 +1,4 @@ --project('protocol buffer test', 'cpp', default_options: ['cpp_std=c++11']) +-project('protocol buffer test', 'cpp', default_options: ['cpp_std=c++14']) +project('protocol buffer test', 'cpp', default_options: ['cpp_std=c++17']) protoc = find_program('protoc', required : false) diff --git a/extra/meson/PKGBUILD b/extra/meson/PKGBUILD index b454f8ce6..fab74e4ac 100644 --- a/extra/meson/PKGBUILD +++ b/extra/meson/PKGBUILD @@ -6,8 +6,8 @@ # - disable lto in arch-meson pkgname=meson -pkgver=1.2.0 -pkgrel=3 +pkgver=1.2.1 +pkgrel=1 pkgdesc="High productivity build system" url="https://mesonbuild.com/" arch=(any) @@ -78,15 +78,15 @@ source=( 0001-Skip-broken-tests.patch 0002-Use-C-17-for-protobuf-tests.patch ) -b2sums=('a8239c41ab5d20c26c057293dc85e5577eb9e6eef7a39acc67a0b5b1e82b1afae341936431d96571ff83e96b7648a80a16cfd8eb581ff29b2ca88615657d5ca3' +b2sums=('b79fa78618cbebfb26ea40e698c495e63d722ba3204d4fed92d087e4a588b49666b476c55916f1435b7ca62f24843c683f1da09751754e928c838c1bf138ce58' 'SKIP' - 'eb67d25e967aaeaec9453bf9af6229cbefd6fa75982e3782e703b440359d8042690d1c8a9542773dcf160af03f36a18e3b9ae3426cf566aa3679164317e774f4' - '9bb2565a8667b71c901aa690b4eb36b64011191cd7a9420c244350d0d9659657347e8a9852945fcc606f8d235af92d18adaf5804ccb60fa1fc285dba79fd1126' + '841eb9a6e348a537f9e50625e66318704e6279a70b60f2c98201c74bba007390d0a29bec2e2cba80c957bbe09e88fbcaf390eefc1ec60f1f2d5842c9d1eb5233' + '3ba44f090e68877d96e7d8aa56442be719e074f5aeb9ea7cae643338a34c33a72e3082d855e868a54d4035a4ea288ccda8ad29a0313204ee8a2419c7d203c4b3' '211cee61f117fd1d582d7a613a8634f044e9e307791c4154c6da72bccd5f06856801b14bcb26157ee682b5935c48ffd2098a5fabab2232726d7758cf091c07f7' - '1822a74c73806b1036c72c13a03756a0bceee4684bdf97f775c18d9e21ba524f3544a66ecb1bd3cec826177c4747942c6d48d1e62aec8bee1b75b8108abafbe3' + 'e56c75dd9122d866e8a92381f1f8a3fa268451d13a18b73906c0089601d3e6edf28602b36f40d8a32758e9958a167a1bdccd70283581e19b2ed39863640daf95' '7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e' - 'f4e232c858b81ae3839a4d721257ef8fa3a6a960c7aff1369a1caa88f9e8df7adbf4a1839072ebdb43175820ce8faec9ba303adb91c85f57ee28fda8cfdf7260' - 'a60bbc46b1b3d1067716ff912ecd09c09c22460fac27105e591cb77905d4c8ca43e59f3f5a644737d68dd408a77071eb07e65e88731f3673363ba7b57d587071') + '849a1acafac499a0d540973157cec758b06a8340a5bbd11050ea8c2fd48de0e32a9d0d017fdeab1cf1a42031c4341c5c1b4c7688c90140246ec4560c7b149bbe' + '338df79aa545c2eaa10e9c14ca93b59456572a0c31721e50f202daab8fbbe9595f6cd8575b6e11b333398ebb9dd9eef1f45beb9c7e24ed475e9fa6782e1d98f4') validpgpkeys=( 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 # Jussi Pakkanen ) diff --git a/extra/meson/cross-lib32 b/extra/meson/cross-lib32 index fc4f3027d..8f5cd26a2 100644 --- a/extra/meson/cross-lib32 +++ b/extra/meson/cross-lib32 @@ -1,7 +1,7 @@ [binaries] c = ['gcc', '-m32'] cpp = ['g++', '-m32'] -rust = ['rustc', '--target', 'i686-pc-linux-gnu'] +rust = ['rustc', '--target', 'i686-unknown-linux-gnu'] pkgconfig = 'i686-pc-linux-gnu-pkg-config' llvm-config = 'llvm-config32' strip = 'strip'