summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2022-03-01 23:56:13 +0100
committerKhem Raj <raj.khem@gmail.com>2022-03-03 08:50:19 -0800
commite7bfd14f9765727f1865c6255cd8fa8831da6229 (patch)
tree9b4ebb6c684ac42569e20bb4c88c3da32016d3b1
parent3603a0b384500a62328b406b2f10436f0db608e7 (diff)
downloadmeta-openembedded-e7bfd14f9765727f1865c6255cd8fa8831da6229.tar.gz
gnome-tweaks: Fix build on latest meson
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch33
-rw-r--r--meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb5
2 files changed, 37 insertions, 1 deletions
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 @@
1From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001
2From: Mae Dartmann <hello@maedartmann.name>
3Date: Wed, 16 Feb 2022 06:08:41 +0000
4Subject: [PATCH] meson: fix invalid positional argument
5
6Upstream-Status: Accepted[https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8]
7---
8 data/meson.build | 4 ++--
9 1 file changed, 2 insertions(+), 2 deletions(-)
10
11diff --git a/data/meson.build b/data/meson.build
12index fd6d5da..74f7e82 100644
13--- a/data/meson.build
14+++ b/data/meson.build
15@@ -1,5 +1,5 @@
16 appdata_file = 'org.gnome.tweaks.appdata.xml'
17-i18n.merge_file(appdata_file,
18+i18n.merge_file(
19 input: appdata_file + '.in',
20 output: appdata_file,
21 po_dir: '../po',
22@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file,
23 )
24
25 desktop_file = 'org.gnome.tweaks.desktop'
26-i18n.merge_file(desktop_file,
27+i18n.merge_file(
28 input: desktop_file + '.in',
29 output: desktop_file,
30 po_dir: '../po',
31--
32GitLab
33
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"
19GIR_MESON_OPTION = "" 19GIR_MESON_OPTION = ""
20 20
21SRC_URI[archive.sha256sum] = "f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a" 21SRC_URI[archive.sha256sum] = "f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a"
22SRC_URI += "file://0001-Make-python-path-configurable.patch" 22SRC_URI += " \
23 file://0001-Make-python-path-configurable.patch \
24 file://0002-meson-fix-invalid-positional-argument.patch \
25"
23 26
24EXTRA_OEMESON = "-Dpython_site_dir=${PYTHON_SITEPACKAGES_DIR}" 27EXTRA_OEMESON = "-Dpython_site_dir=${PYTHON_SITEPACKAGES_DIR}"
25 28