summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-04-07 19:00:25 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-13 16:52:23 +0100
commit40d55d80ca307637aaa6d70e8fe1749aeec284b9 (patch)
tree9b44c444489f563275deac6e7f679b97e1041a50 /meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch
parent54fddf8d0aa1b9623053085de943faf7c938132e (diff)
downloadpoky-40d55d80ca307637aaa6d70e8fe1749aeec284b9.tar.gz
epiphany: upgrade 41.3 -> 42.0
The new version uses printenv from coreutils during builds. (From OE-Core rev: 1d46d4c1150743a04ddf3d9936e431b487676043) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch')
-rw-r--r--meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch b/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch
deleted file mode 100644
index f20975c3bd..0000000000
--- a/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001
2From: rvalue <i@rvalue.moe>
3Date: Wed, 24 Nov 2021 04:52:42 +0000
4Subject: [PATCH] Remove incorrect args for i18n.merge_file
5
6Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
7Upstream-Status: Backport
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 data/meson.build | 2 --
11 1 file changed, 2 deletions(-)
12
13diff --git a/data/meson.build b/data/meson.build
14index 46df3fd80..eac6b8224 100644
15--- a/data/meson.build
16+++ b/data/meson.build
17@@ -16,7 +16,6 @@ install_data(
18 desktop_conf = configuration_data()
19 desktop_conf.set('icon', application_id)
20 desktop = i18n.merge_file(
21- 'desktop',
22 input: configure_file(
23 input: files('org.gnome.Epiphany.desktop.in.in'),
24 output: 'org.gnome.Epiphany.desktop.in',
25@@ -32,7 +31,6 @@ desktop = i18n.merge_file(
26 appdata_conf = configuration_data()
27 appdata_conf.set('appid', application_id)
28 appdata = i18n.merge_file(
29- 'appdata',
30 input: configure_file(
31 input: files('org.gnome.Epiphany.appdata.xml.in.in'),
32 output: 'org.gnome.Epiphany.appdata.xml.in',
33--
34GitLab
35