From patchwork Fri Mar 1 22:05:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 40376 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4186C54EC7 for ; Fri, 1 Mar 2024 22:05:19 +0000 (UTC) Received: from a27-29.smtp-out.us-west-2.amazonses.com (a27-29.smtp-out.us-west-2.amazonses.com [54.240.27.29]) by mx.groups.io with SMTP id smtpd.web10.36620.1709330716144369960 for ; Fri, 01 Mar 2024 14:05:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=TI8JChAj; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=JaNCKBDd; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.29, mailfrom: 0101018dfc0cd84c-180e198c-fd38-434d-a53b-8447e7c83cc6-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1709330716; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=bHft71R0EDKpFstruuHhOHXzU3x4kRLDMu2qrdiSCXI=; b=TI8JChAjli3wkA0B+r17ZfJk5w+x2wv0biDqdLo0jgmtPNG4jus2ht8vWqWblOFc qBLDzrLs1+Ac8Vu48p4E3T+RIVd/Pk6l2/sU+0+Iav5o/kcvmL2WEPboVfkm/T69DtD 6S47riHp7CF0sd/1pYlhzJlv48R4mtIygQ8/NysI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1709330716; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=bHft71R0EDKpFstruuHhOHXzU3x4kRLDMu2qrdiSCXI=; b=JaNCKBDdGM9idS7hBdWv/QotWE9nYPw2xRk7DbBBrh+1Cj/f3DtNVU0RHr2Q9q8O e95nDZPrlTaX+8VrcKikPA00n4gkEqQRx/ElOfLEdKp5RJu1vKKaLxTGcd85n0hKlIm MEbzojwlba/reAJLJTOXTVzKUIqc6KK2VGF7r6qc= MIME-Version: 1.0 From: auh@yoctoproject.org To: Alexander Kanavin Cc: openembedded-core@lists.openembedded.org Subject: [AUH] epiphany: upgrading to 45.3 SUCCEEDED Message-ID: <0101018dfc0cd84c-180e198c-fd38-434d-a53b-8447e7c83cc6-000000@us-west-2.amazonses.com> Date: Fri, 1 Mar 2024 22:05:16 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.03.01-54.240.27.29 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 01 Mar 2024 22:05:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/196505 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *epiphany* to *45.3* has Succeeded. Next steps: - apply the patch: git am 0001-epiphany-upgrade-45.1-45.3.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From e6af7ce1fff757145d409bdbb847878487c11913 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Fri, 1 Mar 2024 15:57:46 +0000 Subject: [PATCH] epiphany: upgrade 45.1 -> 45.3 --- .../{epiphany_45.1.bb => epiphany_45.3.bb} | 2 +- ...p-meson.build-disable-the-use-of-yelp.patch | 3 +-- .../epiphany/files/distributor.patch | 17 ++++++++++++----- .../epiphany/files/migrator.patch | 18 +++++++++++++----- 4 files changed, 27 insertions(+), 13 deletions(-) rename meta/recipes-gnome/epiphany/{epiphany_45.1.bb => epiphany_45.3.bb} (94%) diff --git a/meta/recipes-gnome/epiphany/epiphany_45.1.bb b/meta/recipes-gnome/epiphany/epiphany_45.3.bb similarity index 94% rename from meta/recipes-gnome/epiphany/epiphany_45.1.bb rename to 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 file://migrator.patch \ file://distributor.patch \ " -SRC_URI[archive.sha256sum] = "7c994ef34ecd60e915de331ee123c08938f9623cefada6d50b99e3c9c5ad8135" +SRC_URI[archive.sha256sum] = "6c302e9bdd66290cb0e26f62843cd4c435a4955abdbb4f151f07dc80495d6730" # Developer mode enables debugging 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 @@ -From 77c9f87dc2b3ad0854a678e234e22dfb31902b82 Mon Sep 17 00:00:00 2001 +From bd45c75fe691e275d7a7d7e641ac66b153369a1c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 31 Jan 2018 15:50:38 +0200 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] Signed-off-by: Alexander Kanavin - --- help/meson.build | 8 ++++---- 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 @@ -Don't encode the distro from /etc/os-release into the binaries. +From c297f5b89d7c8e98ac98e1d9a7506df6db6fc025 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +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 RP 2021/2/26 +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) -Index: epiphany-3.38.2/meson.build -=================================================================== ---- epiphany-3.38.2.orig/meson.build -+++ epiphany-3.38.2/meson.build +diff --git a/meson.build b/meson.build +index e416cc7..ee5f7b1 100644 +--- a/meson.build ++++ b/meson.build @@ -15,6 +15,7 @@ if r.returncode() == 0 else 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 @@ +From b38a4ceaeec05efb1b822d52c43590e7fd518113 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +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 for build time tests but in our case those would be on target anyway do use the target paths. Upstream-Status: Pending 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 -=================================================================== ---- epiphany-3.38.2.orig/lib/ephy-profile-utils.c -+++ epiphany-3.38.2/lib/ephy-profile-utils.c -@@ -130,10 +130,10 @@ ephy_profile_utils_do_migration (const c +diff --git a/lib/ephy-profile-utils.c b/lib/ephy-profile-utils.c +index a2f6181..5218077 100644 +--- a/lib/ephy-profile-utils.c ++++ b/lib/ephy-profile-utils.c +@@ -130,10 +130,10 @@ ephy_profile_utils_do_migration (const char *profile_directory, argv[i++] = NULL; #if DEVELOPER_MODE