From e7bfd14f9765727f1865c6255cd8fa8831da6229 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 1 Mar 2022 23:56:13 +0100 Subject: gnome-tweaks: Fix build on latest meson MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- ...002-meson-fix-invalid-positional-argument.patch | 33 ++++++++++++++++++++++ .../gnome-tweaks/gnome-tweaks_40.0.bb | 5 +++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch new file mode 100644 index 0000000000..dfa4615a3d --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch @@ -0,0 +1,33 @@ +From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001 +From: Mae Dartmann +Date: Wed, 16 Feb 2022 06:08:41 +0000 +Subject: [PATCH] meson: fix invalid positional argument + +Upstream-Status: Accepted[https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8] +--- + data/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index fd6d5da..74f7e82 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,5 +1,5 @@ + appdata_file = 'org.gnome.tweaks.appdata.xml' +-i18n.merge_file(appdata_file, ++i18n.merge_file( + input: appdata_file + '.in', + output: appdata_file, + po_dir: '../po', +@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file, + ) + + desktop_file = 'org.gnome.tweaks.desktop' +-i18n.merge_file(desktop_file, ++i18n.merge_file( + input: desktop_file + '.in', + output: desktop_file, + po_dir: '../po', +-- +GitLab + diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb index 30275c97e3..c816fc209a 100644 --- a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb +++ b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb @@ -19,7 +19,10 @@ REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" GIR_MESON_OPTION = "" SRC_URI[archive.sha256sum] = "f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a" -SRC_URI += "file://0001-Make-python-path-configurable.patch" +SRC_URI += " \ + file://0001-Make-python-path-configurable.patch \ + file://0002-meson-fix-invalid-positional-argument.patch \ +" EXTRA_OEMESON = "-Dpython_site_dir=${PYTHON_SITEPACKAGES_DIR}" -- cgit v1.2.3-54-g00ecf