diff options
Diffstat (limited to 'meta/recipes-gnome/epiphany')
-rw-r--r-- | meta/recipes-gnome/epiphany/epiphany_45.3.bb (renamed from meta/recipes-gnome/epiphany/epiphany_45.1.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch | 3 | ||||
-rw-r--r-- | meta/recipes-gnome/epiphany/files/distributor.patch | 17 | ||||
-rw-r--r-- | meta/recipes-gnome/epiphany/files/migrator.patch | 18 |
4 files changed, 27 insertions, 13 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_45.1.bb b/meta/recipes-gnome/epiphany/epiphany_45.3.bb index c8631e05e9..eec52e321a 100644 --- a/meta/recipes-gnome/epiphany/epiphany_45.1.bb +++ b/meta/recipes-gnome/epiphany/epiphany_45.3.bb | |||
@@ -31,7 +31,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN | |||
31 | file://migrator.patch \ | 31 | file://migrator.patch \ |
32 | file://distributor.patch \ | 32 | file://distributor.patch \ |
33 | " | 33 | " |
34 | SRC_URI[archive.sha256sum] = "7c994ef34ecd60e915de331ee123c08938f9623cefada6d50b99e3c9c5ad8135" | 34 | SRC_URI[archive.sha256sum] = "6c302e9bdd66290cb0e26f62843cd4c435a4955abdbb4f151f07dc80495d6730" |
35 | 35 | ||
36 | # Developer mode enables debugging | 36 | # Developer mode enables debugging |
37 | PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" | 37 | PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" |
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 a6c4f92c86..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 77c9f87dc2b3ad0854a678e234e22dfb31902b82 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,7 +7,6 @@ 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(-) |
diff --git a/meta/recipes-gnome/epiphany/files/distributor.patch b/meta/recipes-gnome/epiphany/files/distributor.patch index b09c9b38d2..a2800eb62d 100644 --- a/meta/recipes-gnome/epiphany/files/distributor.patch +++ b/meta/recipes-gnome/epiphany/files/distributor.patch | |||
@@ -1,12 +1,19 @@ | |||
1 | Don't encode the distro from /etc/os-release into the binaries. | 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. | ||
2 | 6 | ||
3 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
4 | RP 2021/2/26 | 8 | RP 2021/2/26 |
9 | --- | ||
10 | meson.build | 1 + | ||
11 | 1 file changed, 1 insertion(+) | ||
5 | 12 | ||
6 | Index: epiphany-3.38.2/meson.build | 13 | diff --git a/meson.build b/meson.build |
7 | =================================================================== | 14 | index e416cc7..ee5f7b1 100644 |
8 | --- epiphany-3.38.2.orig/meson.build | 15 | --- a/meson.build |
9 | +++ epiphany-3.38.2/meson.build | 16 | +++ b/meson.build |
10 | @@ -15,6 +15,7 @@ if r.returncode() == 0 | 17 | @@ -15,6 +15,7 @@ if r.returncode() == 0 |
11 | else | 18 | else |
12 | distributor_name = 'GNOME Web' | 19 | distributor_name = 'GNOME Web' |
diff --git a/meta/recipes-gnome/epiphany/files/migrator.patch b/meta/recipes-gnome/epiphany/files/migrator.patch index a9a650a64a..1b4404c8ca 100644 --- a/meta/recipes-gnome/epiphany/files/migrator.patch +++ b/meta/recipes-gnome/epiphany/files/migrator.patch | |||
@@ -1,15 +1,23 @@ | |||
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 | |||
1 | We don't want to encide BUILD_ROOT into target packages. This is used | 6 | We don't want to encide BUILD_ROOT into target packages. This is used |
2 | for build time tests but in our case those would be on target anyway | 7 | for build time tests but in our case those would be on target anyway |
3 | do use the target paths. | 8 | do use the target paths. |
4 | 9 | ||
5 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
6 | RP 2021/2/25 | 11 | RP 2021/2/25 |
12 | --- | ||
13 | lib/ephy-profile-utils.c | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
7 | 15 | ||
8 | Index: epiphany-3.38.2/lib/ephy-profile-utils.c | 16 | diff --git a/lib/ephy-profile-utils.c b/lib/ephy-profile-utils.c |
9 | =================================================================== | 17 | index a2f6181..5218077 100644 |
10 | --- epiphany-3.38.2.orig/lib/ephy-profile-utils.c | 18 | --- a/lib/ephy-profile-utils.c |
11 | +++ epiphany-3.38.2/lib/ephy-profile-utils.c | 19 | +++ b/lib/ephy-profile-utils.c |
12 | @@ -130,10 +130,10 @@ ephy_profile_utils_do_migration (const c | 20 | @@ -130,10 +130,10 @@ ephy_profile_utils_do_migration (const char *profile_directory, |
13 | argv[i++] = NULL; | 21 | argv[i++] = NULL; |
14 | 22 | ||
15 | #if DEVELOPER_MODE | 23 | #if DEVELOPER_MODE |