diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-01-21 22:38:49 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2022-01-24 09:11:01 -0800 |
| commit | 5eddbcad3f54392784a7db43b73e440d3281e645 (patch) | |
| tree | 83e409ffa4a696c6eabcbc027b40a361e5ef77a7 /meta-gnome | |
| parent | e203b58139ff27051fea30359f8ab20c809f3122 (diff) | |
| download | meta-openembedded-contrib-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')
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 0000000000..c80fda63a3 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-meson-remove-extraneous-positional-argument.patch @@ -0,0 +1,36 @@ +From c38c604b06a63f690d67318d4ef97ac556264876 Mon Sep 17 00:00:00 2001 +From: Jack Hill <jackhill@jackhill.us> +Date: Thu, 18 Nov 2021 00:46:58 -0500 +Subject: [PATCH] meson: remove extraneous positional argument + +* data/meson.build (desktop_file) + (metainfo_file): Remove extraneous positional argument. + +Closes #186 + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index fd570b3..4e2e2e8 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,7 +1,6 @@ + gnome = import('gnome') + + desktop_file = i18n.merge_file( +- 'desktop', + type: 'desktop', + input: 'org.gnome.Screenshot.desktop.in', + output: 'org.gnome.Screenshot.desktop', +@@ -23,7 +22,6 @@ if desktop_file_validate.found() + endif + + metainfo_file = i18n.merge_file( +- 'appdata', + input: 'org.gnome.Screenshot.metainfo.xml.in', + output: 'org.gnome.Screenshot.metainfo.xml', + 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 834b443fab..18d73d872a 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" inherit features_check gnomebase gettext upstream-version-is-even pkgconfig +SRC_URI += " file://0001-meson-remove-extraneous-positional-argument.patch" SRC_URI[archive.sha256sum] = "4adb7dec926428f74263d5796673cf142e4720b6e768f5468a8d0933f98c9597" DEPENDS += "glib-2.0 glib-2.0-native gtk+3 libhandy xext" |