summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-01-21 22:38:49 +0100
committerKhem Raj <raj.khem@gmail.com>2022-01-24 09:11:01 -0800
commit5eddbcad3f54392784a7db43b73e440d3281e645 (patch)
tree83e409ffa4a696c6eabcbc027b40a361e5ef77a7 /meta-gnome
parente203b58139ff27051fea30359f8ab20c809f3122 (diff)
downloadmeta-openembedded-5eddbcad3f54392784a7db43b73e440d3281e645.tar.gz
gnome-screenshot: backport 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')
-rw-r--r--meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-meson-remove-extraneous-positional-argument.patch36
-rw-r--r--meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-meson-remove-extraneous-positional-argument.patch b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-meson-remove-extraneous-positional-argument.patch
new file mode 100644
index 000000000..c80fda63a
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-meson-remove-extraneous-positional-argument.patch
@@ -0,0 +1,36 @@
1From c38c604b06a63f690d67318d4ef97ac556264876 Mon Sep 17 00:00:00 2001
2From: Jack Hill <jackhill@jackhill.us>
3Date: Thu, 18 Nov 2021 00:46:58 -0500
4Subject: [PATCH] meson: remove extraneous positional argument
5
6* data/meson.build (desktop_file)
7 (metainfo_file): Remove extraneous positional argument.
8
9Closes #186
10
11Upstream-Status: Backport
12Signed-off-by: Alexander Kanavin <alex@linutronix.de>
13---
14 data/meson.build | 2 --
15 1 file changed, 2 deletions(-)
16
17diff --git a/data/meson.build b/data/meson.build
18index fd570b3..4e2e2e8 100644
19--- a/data/meson.build
20+++ b/data/meson.build
21@@ -1,7 +1,6 @@
22 gnome = import('gnome')
23
24 desktop_file = i18n.merge_file(
25- 'desktop',
26 type: 'desktop',
27 input: 'org.gnome.Screenshot.desktop.in',
28 output: 'org.gnome.Screenshot.desktop',
29@@ -23,7 +22,6 @@ if desktop_file_validate.found()
30 endif
31
32 metainfo_file = i18n.merge_file(
33- 'appdata',
34 input: 'org.gnome.Screenshot.metainfo.xml.in',
35 output: 'org.gnome.Screenshot.metainfo.xml',
36 po_dir: join_paths(meson.current_source_dir(), '../po'),
diff --git a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb
index 834b443fa..18d73d872 100644
--- a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb
@@ -10,6 +10,7 @@ GNOMEBASEBUILDCLASS = "meson"
10 10
11inherit features_check gnomebase gettext upstream-version-is-even pkgconfig 11inherit features_check gnomebase gettext upstream-version-is-even pkgconfig
12 12
13SRC_URI += " file://0001-meson-remove-extraneous-positional-argument.patch"
13SRC_URI[archive.sha256sum] = "4adb7dec926428f74263d5796673cf142e4720b6e768f5468a8d0933f98c9597" 14SRC_URI[archive.sha256sum] = "4adb7dec926428f74263d5796673cf142e4720b6e768f5468a8d0933f98c9597"
14 15
15DEPENDS += "glib-2.0 glib-2.0-native gtk+3 libhandy xext" 16DEPENDS += "glib-2.0 glib-2.0-native gtk+3 libhandy xext"