diff options
| author | Bob Funk <bobfunk11@gmail.com> | 2023-02-09 22:28:35 +0000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2023-02-11 09:30:35 +0700 |
| commit | 5953e6209ccfa697f25272e8f51452fb8257ff97 (patch) | |
| tree | d722d4904bdbb22c14d51bbd6090c68386a277eb | |
| parent | fa14651540c15b952d7cef70850c972fa9041f11 (diff) | |
desktop/gnome-settings-daemon: Meson patch.
Signed-off-by: bedlam <dave@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | desktop/gnome-settings-daemon/afa7e4bb9c519e2daf500a6079088669500768c0.patch | 38 | ||||
| -rw-r--r-- | desktop/gnome-settings-daemon/gnome-settings-daemon.SlackBuild | 4 |
2 files changed, 42 insertions, 0 deletions
diff --git a/desktop/gnome-settings-daemon/afa7e4bb9c519e2daf500a6079088669500768c0.patch b/desktop/gnome-settings-daemon/afa7e4bb9c519e2daf500a6079088669500768c0.patch new file mode 100644 index 0000000000000..b7c03ca2da630 --- /dev/null +++ b/desktop/gnome-settings-daemon/afa7e4bb9c519e2daf500a6079088669500768c0.patch @@ -0,0 +1,38 @@ +From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001 +From: Marvin Schmidt <marv@exherbo.org> +Date: Wed, 26 Jan 2022 23:08:58 +0100 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. +--- + plugins/power/meson.build | 1 - + plugins/wacom/meson.build | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/plugins/power/meson.build b/plugins/power/meson.build +index 69e619f2..014bb6da 100644 +--- a/plugins/power/meson.build ++++ b/plugins/power/meson.build +@@ -76,7 +76,6 @@ if host_is_linux + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: policy, + po_dir: po_dir, +diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build +index d8dd0ec7..c00323d4 100644 +--- a/plugins/wacom/meson.build ++++ b/plugins/wacom/meson.build +@@ -7,7 +7,6 @@ policy_in = configure_file( + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: policy, + po_dir: po_dir, +-- +GitLab + diff --git a/desktop/gnome-settings-daemon/gnome-settings-daemon.SlackBuild b/desktop/gnome-settings-daemon/gnome-settings-daemon.SlackBuild index 3519f42d64256..d4528590cb3fa 100644 --- a/desktop/gnome-settings-daemon/gnome-settings-daemon.SlackBuild +++ b/desktop/gnome-settings-daemon/gnome-settings-daemon.SlackBuild @@ -76,6 +76,10 @@ find -L . -prune -name 'subprojects/gvc/.gitlab-ci' \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Patch plugins/{power,wacom}/meson.build to drop unused argument, +# which causes a build fail in meson vesions 0.60.0 or later: +patch -Np1 -i $CWD/afa7e4bb9c519e2daf500a6079088669500768c0.patch + mkdir build cd build CFLAGS="$SLKCFLAGS" \ |