mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
x11-themes/arc-theme: Patch to fix build with newer Meson
Thanks to Aaron Masover. Closes: https://bugs.gentoo.org/981315 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
PYTHON_COMPAT=( python3_{12..14} )
|
||||
|
||||
inherit meson python-any-r1
|
||||
|
||||
@@ -53,6 +53,10 @@ RDEPEND="
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-meson-1.12.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
# Cinnamon still uses metacity themes for its window manager.
|
||||
# so we enable metacity theme too if USE=cinnamon
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
From ff6f49f32de68ed0ec9405a1ed73e9e845c77b1c Mon Sep 17 00:00:00 2001
|
||||
From: Aaron Masover <amasover@gmail.com>
|
||||
Date: Wed, 19 Aug 2026 23:47:53 -0600
|
||||
Subject: [PATCH] gnome-shell: exclude directories from gresource depend_files
|
||||
|
||||
The find that collects gresource asset dependencies also prints the
|
||||
three searched directories themselves. Meson 1.12 validates every
|
||||
depend_files entry as an existing *file* (File.from_source_file uses
|
||||
os.path.isfile), so configuring with -Dgnome_shell_gresource=true now
|
||||
fails on the first entry:
|
||||
|
||||
common/gnome-shell/meson.build:98:28: ERROR: File .../icons does not exist.
|
||||
|
||||
Meson 1.11.2 and earlier did not validate these entries, which is why
|
||||
the same tree configured fine before. Filter the find to exclude
|
||||
directories.
|
||||
--- a/common/gnome-shell/meson.build
|
||||
+++ b/common/gnome-shell/meson.build
|
||||
@@ -90,6 +90,7 @@ foreach variant : get_option('variants')
|
||||
meson.current_source_dir() / gnome_shell_ver / 'icons',
|
||||
meson.current_source_dir() / gnome_shell_ver / 'common-assets',
|
||||
meson.current_source_dir() / gnome_shell_ver / variant + '-assets',
|
||||
+ '-not', '-type', 'd',
|
||||
check : true
|
||||
).stdout().split()
|
||||
|
||||
Reference in New Issue
Block a user