1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00

epiphany: upgrade 45.1 -> 45.3

(From OE-Core rev: 7d96a1c77147a08d39b98de6b619cfe5e5c0338c)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2024-03-06 07:42:07 -08:00
committed by Richard Purdie
parent 4d80c539be
commit 36965634be
4 changed files with 27 additions and 13 deletions
@@ -31,7 +31,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN
file://migrator.patch \ file://migrator.patch \
file://distributor.patch \ file://distributor.patch \
" "
SRC_URI[archive.sha256sum] = "7c994ef34ecd60e915de331ee123c08938f9623cefada6d50b99e3c9c5ad8135" SRC_URI[archive.sha256sum] = "6c302e9bdd66290cb0e26f62843cd4c435a4955abdbb4f151f07dc80495d6730"
# Developer mode enables debugging # Developer mode enables debugging
PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false"
@@ -1,4 +1,4 @@
From 77c9f87dc2b3ad0854a678e234e22dfb31902b82 Mon Sep 17 00:00:00 2001 From bd45c75fe691e275d7a7d7e641ac66b153369a1c Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com> From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 31 Jan 2018 15:50:38 +0200 Date: Wed, 31 Jan 2018 15:50:38 +0200
Subject: [PATCH] help/meson.build: disable the use of yelp 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.
Upstream-Status: Inappropriate [oe-core specific] Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
--- ---
help/meson.build | 8 ++++---- help/meson.build | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
@@ -1,12 +1,19 @@
Don't encode the distro from /etc/os-release into the binaries. From c297f5b89d7c8e98ac98e1d9a7506df6db6fc025 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 26 Feb 2021 10:17:52 +0000
Subject: [PATCH] Don't encode the distro from /etc/os-release into the
binaries.
Upstream-Status: Pending Upstream-Status: Pending
RP 2021/2/26 RP 2021/2/26
---
meson.build | 1 +
1 file changed, 1 insertion(+)
Index: epiphany-3.38.2/meson.build diff --git a/meson.build b/meson.build
=================================================================== index e416cc7..ee5f7b1 100644
--- epiphany-3.38.2.orig/meson.build --- a/meson.build
+++ epiphany-3.38.2/meson.build +++ b/meson.build
@@ -15,6 +15,7 @@ if r.returncode() == 0 @@ -15,6 +15,7 @@ if r.returncode() == 0
else else
distributor_name = 'GNOME Web' distributor_name = 'GNOME Web'
@@ -1,15 +1,23 @@
From b38a4ceaeec05efb1b822d52c43590e7fd518113 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 25 Feb 2021 14:52:32 +0000
Subject: [PATCH] epiphany: Fix reproducibility issue
We don't want to encide BUILD_ROOT into target packages. This is used We don't want to encide BUILD_ROOT into target packages. This is used
for build time tests but in our case those would be on target anyway for build time tests but in our case those would be on target anyway
do use the target paths. do use the target paths.
Upstream-Status: Pending Upstream-Status: Pending
RP 2021/2/25 RP 2021/2/25
---
lib/ephy-profile-utils.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: epiphany-3.38.2/lib/ephy-profile-utils.c diff --git a/lib/ephy-profile-utils.c b/lib/ephy-profile-utils.c
=================================================================== index a2f6181..5218077 100644
--- epiphany-3.38.2.orig/lib/ephy-profile-utils.c --- a/lib/ephy-profile-utils.c
+++ epiphany-3.38.2/lib/ephy-profile-utils.c +++ b/lib/ephy-profile-utils.c
@@ -130,10 +130,10 @@ ephy_profile_utils_do_migration (const c @@ -130,10 +130,10 @@ ephy_profile_utils_do_migration (const char *profile_directory,
argv[i++] = NULL; argv[i++] = NULL;
#if DEVELOPER_MODE #if DEVELOPER_MODE