From f3a2570e64af275a1b91d5e7ba353063284b6bd8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 6 Aug 2022 18:23:29 +0200 Subject: [PATCH 1/2] meson: update to 0.63.1. --- ...tall-do-not-trample-install_mode-by-rpath-fixer.patch} | 0 srcpkgs/meson/template | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename srcpkgs/meson/patches/{10702.patch => 0001-minstall-do-not-trample-install_mode-by-rpath-fixer.patch} (100%) diff --git a/srcpkgs/meson/patches/10702.patch b/srcpkgs/meson/patches/0001-minstall-do-not-trample-install_mode-by-rpath-fixer.patch similarity index 100% rename from srcpkgs/meson/patches/10702.patch rename to srcpkgs/meson/patches/0001-minstall-do-not-trample-install_mode-by-rpath-fixer.patch diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index d3243fe16052..3cec0fc58d54 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,12 +1,12 @@ # Template file for 'meson' pkgname=meson -version=0.62.2 -revision=2 +version=0.63.1 +revision=1 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" depends="ninja python3-setuptools" checkdepends="glib-devel gobject-introspection ninja - gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python-devel + gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python3-devel cross-arm-linux-gnueabihf" short_desc="Super fast build system" maintainer="Michal Vasilek " @@ -14,7 +14,7 @@ license="Apache-2.0" homepage="https://mesonbuild.com" changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md" distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz" -checksum=a7669e4c4110b06b743d57cc5d6432591a6677ef2402139fe4f3d42ac13380b0 +checksum=06fe13297213d6ff0121c5d5aab25a56ef938ffec57414ed6086fda272cb65e9 # XXX: sanitizers aren't available on musl if [ "$XBPS_TARGET_LIBC" = glibc ]; then From 531ace7551f9adc736fae7a41b8aeca1e1aed48a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 6 Aug 2022 18:23:26 +0200 Subject: [PATCH 2/2] budgie-desktop: fix build with meson 0.63 --- .../budgie-desktop/patches/meson-0.63.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/budgie-desktop/patches/meson-0.63.patch diff --git a/srcpkgs/budgie-desktop/patches/meson-0.63.patch b/srcpkgs/budgie-desktop/patches/meson-0.63.patch new file mode 100644 index 000000000000..07b36c8dda55 --- /dev/null +++ b/srcpkgs/budgie-desktop/patches/meson-0.63.patch @@ -0,0 +1,33 @@ +From 078ee1b05436adc67ba6175345ebdfd5c0463195 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Mon, 20 Jun 2022 19:59:35 -0400 +Subject: [PATCH] fix broken C std for gvc subproject + +Historically, Meson didn't know how to set c_std for a subproject at +all. Meson 0.63.0 adds support for this, so the default_options kwarg to +subproject now begins to respect this. + +budgie-desktop uses c11, but artificially sets c89 for the gvc +submodule. However, this does not actually work... the build then errors +out when trying to build +subprojects/gvc/test-audio-device-selection.p/test-audio-device-selection.c.o + +Remove the faulty argument. + +Fixes regression in commit 3d6d71c167dd9742cd072e7e6a3453c23ebb2658. +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 763d5a1b..3c52b8f5 100644 +--- a/meson.build ++++ b/meson.build +@@ -130,7 +130,6 @@ with_polkit = get_option('with-polkit') + # Get gvc built before we do anything + gvc = subproject('gvc', + default_options: [ +- 'c_std=c89', + 'static=false', + 'pkglibdir=@0@'.format(rpath_libdir), + 'package_name=' + meson.project_name(),