arc-theme: fix build with meson 1.12

Fixes the `common/gnome-shell/meson.build:98:28: ERROR: File .../icons does not exist.` error.
This commit is contained in:
misuzu
2026-10-01 12:55:52 +03:00
parent b4fd65b198
commit bb657c39a7
2 changed files with 38 additions and 0 deletions

View File

@@ -0,0 +1,32 @@
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.
---
common/gnome-shell/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/gnome-shell/meson.build b/common/gnome-shell/meson.build
index bd71648d0..fa80c0c7f 100644
--- 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()

View File

@@ -25,6 +25,12 @@ stdenv.mkDerivation {
hash = "sha256-vvZvJmsmeYcJT3xVQLg4tmYXEgHprWJls1fbxA3Jxnw=";
};
patches = [
# Fixes `common/gnome-shell/meson.build:98:28: ERROR: File .../icons does not exist.`
# See https://github.com/jnsh/arc-theme/pull/238
./meson_1.12.patch
];
nativeBuildInputs = [
glib # for glib-compile-resources
inkscape