diff options
Diffstat (limited to 'meta/recipes-gnome/epiphany/files')
3 files changed, 60 insertions, 5 deletions
diff --git a/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch b/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch index 118b5d1825..e505466764 100644 --- a/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch +++ b/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3725c254f1d1d8204fa299e71c1e2bfd0ff6a634 Mon Sep 17 00:00:00 2001 | 1 | From bd45c75fe691e275d7a7d7e641ac66b153369a1c Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 31 Jan 2018 15:50:38 +0200 | 3 | Date: Wed, 31 Jan 2018 15:50:38 +0200 |
4 | Subject: [PATCH] help/meson.build: disable the use of yelp | 4 | Subject: [PATCH] help/meson.build: disable the use of yelp |
@@ -7,17 +7,16 @@ In particular this avoids calling itstool which oe-core doesn't provide. | |||
7 | 7 | ||
8 | Upstream-Status: Inappropriate [oe-core specific] | 8 | Upstream-Status: Inappropriate [oe-core specific] |
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
10 | |||
11 | --- | 10 | --- |
12 | help/meson.build | 8 ++++---- | 11 | help/meson.build | 8 ++++---- |
13 | 1 file changed, 4 insertions(+), 4 deletions(-) | 12 | 1 file changed, 4 insertions(+), 4 deletions(-) |
14 | 13 | ||
15 | diff --git a/help/meson.build b/help/meson.build | 14 | diff --git a/help/meson.build b/help/meson.build |
16 | index 484860c..d9b2e80 100644 | 15 | index ff324dd..f5e421d 100644 |
17 | --- a/help/meson.build | 16 | --- a/help/meson.build |
18 | +++ b/help/meson.build | 17 | +++ b/help/meson.build |
19 | @@ -32,7 +32,7 @@ help_media = [ | 18 | @@ -31,7 +31,7 @@ help_media = [ |
20 | 'media/epiphany-private-3-36.png' | 19 | 'media/org.gnome.Epiphany.svg' |
21 | ] | 20 | ] |
22 | 21 | ||
23 | -gnome.yelp(meson.project_name(), | 22 | -gnome.yelp(meson.project_name(), |
diff --git a/meta/recipes-gnome/epiphany/files/distributor.patch b/meta/recipes-gnome/epiphany/files/distributor.patch new file mode 100644 index 0000000000..a2800eb62d --- /dev/null +++ b/meta/recipes-gnome/epiphany/files/distributor.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From c297f5b89d7c8e98ac98e1d9a7506df6db6fc025 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Fri, 26 Feb 2021 10:17:52 +0000 | ||
4 | Subject: [PATCH] Don't encode the distro from /etc/os-release into the | ||
5 | binaries. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | RP 2021/2/26 | ||
9 | --- | ||
10 | meson.build | 1 + | ||
11 | 1 file changed, 1 insertion(+) | ||
12 | |||
13 | diff --git a/meson.build b/meson.build | ||
14 | index e416cc7..ee5f7b1 100644 | ||
15 | --- a/meson.build | ||
16 | +++ b/meson.build | ||
17 | @@ -15,6 +15,7 @@ if r.returncode() == 0 | ||
18 | else | ||
19 | distributor_name = 'GNOME Web' | ||
20 | endif | ||
21 | +distributor_name = 'OpenEmbedded' | ||
22 | |||
23 | prefix = get_option('prefix') | ||
24 | datadir = join_paths(prefix, get_option('datadir')) | ||
diff --git a/meta/recipes-gnome/epiphany/files/migrator.patch b/meta/recipes-gnome/epiphany/files/migrator.patch new file mode 100644 index 0000000000..1b4404c8ca --- /dev/null +++ b/meta/recipes-gnome/epiphany/files/migrator.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From b38a4ceaeec05efb1b822d52c43590e7fd518113 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Thu, 25 Feb 2021 14:52:32 +0000 | ||
4 | Subject: [PATCH] epiphany: Fix reproducibility issue | ||
5 | |||
6 | We don't want to encide BUILD_ROOT into target packages. This is used | ||
7 | for build time tests but in our case those would be on target anyway | ||
8 | do use the target paths. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | RP 2021/2/25 | ||
12 | --- | ||
13 | lib/ephy-profile-utils.c | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/lib/ephy-profile-utils.c b/lib/ephy-profile-utils.c | ||
17 | index a2f6181..5218077 100644 | ||
18 | --- a/lib/ephy-profile-utils.c | ||
19 | +++ b/lib/ephy-profile-utils.c | ||
20 | @@ -130,10 +130,10 @@ ephy_profile_utils_do_migration (const char *profile_directory, | ||
21 | argv[i++] = NULL; | ||
22 | |||
23 | #if DEVELOPER_MODE | ||
24 | - argv[0] = BUILD_ROOT "/src/" EPHY_PROFILE_MIGRATOR; | ||
25 | + argv[0] = PKGLIBEXECDIR "/" EPHY_PROFILE_MIGRATOR; | ||
26 | #else | ||
27 | if (debug) | ||
28 | - argv[0] = BUILD_ROOT "/src/" EPHY_PROFILE_MIGRATOR; | ||
29 | + argv[0] = PKGLIBEXECDIR "/" EPHY_PROFILE_MIGRATOR; | ||
30 | #endif | ||
31 | |||
32 | g_spawn_sync (NULL, (char **)argv, envp, G_SPAWN_SEARCH_PATH, | ||