meson: update to 0.62.2.
This commit is contained in:
parent
986c815084
commit
52f4490fa5
2 changed files with 4 additions and 31 deletions
|
@ -1,26 +0,0 @@
|
||||||
From dac212e1bba707b9ac67b48902d761ee7ca8fa04 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Antoine Jacoutot <ajacoutot@gnome.org>
|
|
||||||
Date: Wed, 23 Mar 2022 22:15:11 +0100
|
|
||||||
Subject: [PATCH] gnome module: properly fallback to gtk-update-icon-cache
|
|
||||||
|
|
||||||
Commit a0cade8f introduced a typo and wrongly check for
|
|
||||||
gtk4-update-icon-cache twice.
|
|
||||||
If gtk4-update-icon-cache (gtk4) is not found, look for
|
|
||||||
gtk-update-icon-cache (gtk3) instead.
|
|
||||||
---
|
|
||||||
mesonbuild/modules/gnome.py | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
|
|
||||||
index 673a781a41d..501be9ae4da 100644
|
|
||||||
--- a/mesonbuild/modules/gnome.py
|
|
||||||
+++ b/mesonbuild/modules/gnome.py
|
|
||||||
@@ -371,7 +371,7 @@ def post_install(self, state: 'ModuleState', args: T.List['TYPE_var'], kwargs: '
|
|
||||||
prog = state.find_program('gtk4-update-icon-cache', required=False)
|
|
||||||
found = isinstance(prog, build.Executable) or prog.found()
|
|
||||||
if not found:
|
|
||||||
- prog = state.find_program('gtk4-update-icon-cache')
|
|
||||||
+ prog = state.find_program('gtk-update-icon-cache')
|
|
||||||
icondir = os.path.join(datadir_abs, 'icons', 'hicolor')
|
|
||||||
script = state.backend.get_executable_serialisation([prog, '-q', '-t', '-f', icondir])
|
|
||||||
script.skip_if_destdir = True
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'meson'
|
# Template file for 'meson'
|
||||||
pkgname=meson
|
pkgname=meson
|
||||||
version=0.62.0
|
version=0.62.2
|
||||||
revision=1
|
revision=1
|
||||||
build_style=python3-module
|
build_style=python3-module
|
||||||
hostmakedepends="python3-devel python3-setuptools"
|
hostmakedepends="python3-devel python3-setuptools"
|
||||||
|
@ -9,12 +9,12 @@ 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 python-devel
|
||||||
cross-arm-linux-gnueabihf"
|
cross-arm-linux-gnueabihf"
|
||||||
short_desc="Super fast build system"
|
short_desc="Super fast build system"
|
||||||
maintainer="John <me@johnnynator.dev>"
|
maintainer="Michal Vasilek <michal@vasilek.cz>"
|
||||||
license="Apache-2.0"
|
license="Apache-2.0"
|
||||||
homepage="https://mesonbuild.com"
|
homepage="https://mesonbuild.com"
|
||||||
changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
|
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"
|
distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
|
||||||
checksum=06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb
|
checksum=a7669e4c4110b06b743d57cc5d6432591a6677ef2402139fe4f3d42ac13380b0
|
||||||
|
|
||||||
# XXX: sanitizers aren't available on musl
|
# XXX: sanitizers aren't available on musl
|
||||||
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
|
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
|
||||||
|
@ -24,8 +24,7 @@ fi
|
||||||
post_patch() {
|
post_patch() {
|
||||||
if [ "$XBPS_TARGET_LIBC" = musl ]; then
|
if [ "$XBPS_TARGET_LIBC" = musl ]; then
|
||||||
vsed -e 's/test_pch_with_address_sanitizer/_&/' \
|
vsed -e 's/test_pch_with_address_sanitizer/_&/' \
|
||||||
-e 's/test_generate_gir_with_address_sanitizer/_&/' \
|
-i unittests/linuxliketests.py
|
||||||
-i run_unittests.py
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue