diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-01-21 22:38:46 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2022-01-24 09:11:01 -0800 |
| commit | 8fe42bbf3035e5c5f8310f181bdf571ffacc6931 (patch) | |
| tree | eff146eb6d5881959f2d31f5ca32edcff949975b /meta-gnome | |
| parent | 1df08a90d01448d87df5541ccbe8ab6eb7d1d317 (diff) | |
| download | meta-openembedded-contrib-8fe42bbf3035e5c5f8310f181bdf571ffacc6931.tar.gz | |
gnome-settings-daemon: add a meson 0.61 patch
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
2 files changed, 41 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch new file mode 100644 index 0000000000..cb758c7c8d --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch @@ -0,0 +1,40 @@ +From 56535d2f1ec64e847e5fbd0613e78bd0dc046519 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek <michal@vasilek.cz> +Date: Fri, 14 Jan 2022 23:55:06 +0100 +Subject: [PATCH] build: remove positional i18n.merge_file arguments + +otherwise building with meson 0.61+ fails: + + ERROR: Function does not take positional arguments. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/281] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + 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 69e619f..014bb6d 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 d8dd0ec..c00323d 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, diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb index 2851ccfd9a..78d6811700 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb @@ -25,6 +25,7 @@ DEPENDS = " \ REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data" GIR_MESON_OPTION = "" +SRC_URI += " file://0001-build-remove-positional-i18n.merge_file-arguments.patch" SRC_URI[archive.sha256sum] = "e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884" PACKAGECONFIG ??= " \ |