Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

meson: update to 0.63.1. #39071

Merged
merged 2 commits into from
Sep 3, 2022
Merged

meson: update to 0.63.1. #39071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd36cc5
meson: update to 0.63.2.
paper42 Aug 6, 2022
c3c8a66
budgie-desktop: fix build with meson 0.63
paper42 Aug 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 33 additions & 0 deletions srcpkgs/budgie-desktop/patches/meson-0.63.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From 078ee1b05436adc67ba6175345ebdfd5c0463195 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz93@gmail.com>
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(),
59 changes: 0 additions & 59 deletions srcpkgs/meson/patches/10702.patch
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions srcpkgs/meson/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# Template file for 'meson'
pkgname=meson
version=0.62.2
revision=2
version=0.63.2
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 <michal@vasilek.cz>"
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=16222f17ef76be0542c91c07994f9676ae879f46fc21c0c786a21ef2cb518bbf

# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
Expand Down