diff options
Diffstat (limited to 'meta/recipes-gnome/epiphany')
-rw-r--r-- | meta/recipes-gnome/epiphany/epiphany_41.3.bb | 1 | ||||
-rw-r--r-- | meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch | 35 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_41.3.bb b/meta/recipes-gnome/epiphany/epiphany_41.3.bb index 634ba8a1b9..befd817165 100644 --- a/meta/recipes-gnome/epiphany/epiphany_41.3.bb +++ b/meta/recipes-gnome/epiphany/epiphany_41.3.bb | |||
@@ -24,6 +24,7 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" | |||
24 | 24 | ||
25 | SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ | 25 | SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ |
26 | file://0002-help-meson.build-disable-the-use-of-yelp.patch \ | 26 | file://0002-help-meson.build-disable-the-use-of-yelp.patch \ |
27 | file://bfbb5f7bab38301d8a4a444173acdae8d9692146.patch \ | ||
27 | file://migrator.patch \ | 28 | file://migrator.patch \ |
28 | file://distributor.patch \ | 29 | file://distributor.patch \ |
29 | " | 30 | " |
diff --git a/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch b/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch new file mode 100644 index 0000000000..f20975c3bd --- /dev/null +++ b/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001 | ||
2 | From: rvalue <i@rvalue.moe> | ||
3 | Date: Wed, 24 Nov 2021 04:52:42 +0000 | ||
4 | Subject: [PATCH] Remove incorrect args for i18n.merge_file | ||
5 | |||
6 | Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031> | ||
7 | Upstream-Status: Backport | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | --- | ||
10 | data/meson.build | 2 -- | ||
11 | 1 file changed, 2 deletions(-) | ||
12 | |||
13 | diff --git a/data/meson.build b/data/meson.build | ||
14 | index 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 | -- | ||
34 | GitLab | ||
35 | |||