diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-01-21 22:38:56 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-01-24 09:11:01 -0800 |
commit | 7bbd43a783af1c03ddcbc4cd1e8b7f35686647f5 (patch) | |
tree | 4e5ce37bfe035c8f8cab495d0d583d9d92bea41f /meta-gnome | |
parent | 137ebc79d53b01184ccab00d4ee7fbfe833b2051 (diff) | |
download | meta-openembedded-7bbd43a783af1c03ddcbc4cd1e8b7f35686647f5.tar.gz |
gnome-photos: 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')
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch | 31 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch new file mode 100644 index 000000000..9fb7a5b9e --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From a112e8a089851035945b6848849149bb36787906 Mon Sep 17 00:00:00 2001 | ||
2 | From: rvalue <i@rvalue.moe> | ||
3 | Date: Fri, 21 Jan 2022 12:36:02 +0000 | ||
4 | Subject: [PATCH] meson: remove incorrect args for i18n.merge_file | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
8 | --- | ||
9 | data/meson.build | 2 -- | ||
10 | 1 file changed, 2 deletions(-) | ||
11 | |||
12 | diff --git a/data/meson.build b/data/meson.build | ||
13 | index 6e7192e..94271de 100644 | ||
14 | --- a/data/meson.build | ||
15 | +++ b/data/meson.build | ||
16 | @@ -3,7 +3,6 @@ subdir('icons') | ||
17 | appdata = photos_namespace + '.appdata.xml' | ||
18 | |||
19 | i18n.merge_file( | ||
20 | - appdata, | ||
21 | input: appdata + '.in', | ||
22 | output: appdata, | ||
23 | po_dir: po_dir, | ||
24 | @@ -23,7 +22,6 @@ desktop_in = configure_file( | ||
25 | ) | ||
26 | |||
27 | i18n.merge_file( | ||
28 | - desktop, | ||
29 | type: 'desktop', | ||
30 | input: desktop_in, | ||
31 | output: desktop, | ||
diff --git a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb index fb1b7d30b..ae8ab31f6 100644 --- a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb +++ b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb | |||
@@ -30,6 +30,7 @@ def gnome_verdir(v): | |||
30 | 30 | ||
31 | REQUIRED_DISTRO_FEATURES = "x11" | 31 | REQUIRED_DISTRO_FEATURES = "x11" |
32 | 32 | ||
33 | SRC_URI += " file://0001-meson-remove-incorrect-args-for-i18n.merge_file.patch" | ||
33 | SRC_URI[archive.sha256sum] = "e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af" | 34 | SRC_URI[archive.sha256sum] = "e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af" |
34 | 35 | ||
35 | do_install:append() { | 36 | do_install:append() { |