From patchwork Thu Feb 1 18:00:06 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: 38614 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 E26D0C48BC4 for ; Thu, 1 Feb 2024 18:00:15 +0000 (UTC) Received: from a27-33.smtp-out.us-west-2.amazonses.com (a27-33.smtp-out.us-west-2.amazonses.com [54.240.27.33]) by mx.groups.io with SMTP id smtpd.web11.2125.1706810408085222850 for ; Thu, 01 Feb 2024 10:00:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=Ylcb/iKh; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=Ht4f0+W9; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.33, mailfrom: 0101018d65d3f778-fdf21b40-fd38-4298-998e-cde661ae4871-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=1706810407; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=hBwASudRFA2GUVY9qvndJtmh8/VssTm4K6zSUwQLiEo=; b=Ylcb/iKhZCceLDQQhSfvMAEEkxPRzNJ55UdJmh+fu7XkXSX9CnQp6OdUichaJkP4 fsRYjwqsfWXU1nu/VEC4O4kRzwdtoWE2GdvT8n/lPC9kiSKZtRmJ0NyaW3Z1JX/GHV0 yG1aFCXTeuWPgAfh1zPYZrp0PoepyWJcS+gfERUU= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1706810407; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=hBwASudRFA2GUVY9qvndJtmh8/VssTm4K6zSUwQLiEo=; b=Ht4f0+W9QQ5+3Iu/YOwDW0mWoM7G6VFRotkzEP8hx2hvVX9Ea1XqdeAu45Huk6B9 OefjBslqfZkLYYzoTFjdvhUNPBVEh6uonMN0fO4Cc9F8OyplGHwoovtd76BWQlIeHaV yRr/EDCf/QULwcmuWNt7JmgQvIHNsgRNKo8DIba4= MIME-Version: 1.0 From: auh@yoctoproject.org To: Alexander Kanavin Cc: openembedded-core@lists.openembedded.org Subject: [AUH] epiphany: upgrading to 45.2 SUCCEEDED Message-ID: <0101018d65d3f778-fdf21b40-fd38-4298-998e-cde661ae4871-000000@us-west-2.amazonses.com> Date: Thu, 1 Feb 2024 18:00:06 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.02.01-54.240.27.33 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 ; Thu, 01 Feb 2024 18:00:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194702 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *epiphany* to *45.2* has Succeeded. Next steps: - apply the patch: git am 0001-epiphany-upgrade-45.1-45.2.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 446161156f808bb5bc6931fdbf89b7c9e2d1ebeb Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Thu, 1 Feb 2024 12:30:29 +0000 Subject: [PATCH] epiphany: upgrade 45.1 -> 45.2 --- .../{epiphany_45.1.bb => epiphany_45.2.bb} | 2 +- ...-meson.build-disable-the-use-of-yelp.patch | 2 +- .../epiphany/files/distributor.patch | 18 +++++++++++++----- .../epiphany/files/migrator.patch | 19 ++++++++++++++----- 4 files changed, 29 insertions(+), 12 deletions(-) rename meta/recipes-gnome/epiphany/{epiphany_45.1.bb => epiphany_45.2.bb} (94%) diff --git a/meta/recipes-gnome/epiphany/epiphany_45.1.bb b/meta/recipes-gnome/epiphany/epiphany_45.2.bb similarity index 94% rename from meta/recipes-gnome/epiphany/epiphany_45.1.bb rename to meta/recipes-gnome/epiphany/epiphany_45.2.bb index c8631e05e9..89ce9dc669 100644 --- a/meta/recipes-gnome/epiphany/epiphany_45.1.bb +++ b/meta/recipes-gnome/epiphany/epiphany_45.2.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] = "79c71460bffefccef5e67be3fb5fca657853e8216cb626399d2b950ce0320ddc" # 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..4b735a6acb 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 910b7250350d19e5d72ce62571130accb682aa69 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 diff --git a/meta/recipes-gnome/epiphany/files/distributor.patch b/meta/recipes-gnome/epiphany/files/distributor.patch index b09c9b38d2..504ee8223a 100644 --- a/meta/recipes-gnome/epiphany/files/distributor.patch +++ b/meta/recipes-gnome/epiphany/files/distributor.patch @@ -1,12 +1,20 @@ -Don't encode the distro from /etc/os-release into the binaries. +From 5efe7d0ff238fd38bf19c93134e6beeec87b9199 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 -Index: epiphany-3.38.2/meson.build -=================================================================== ---- epiphany-3.38.2.orig/meson.build -+++ epiphany-3.38.2/meson.build +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index 61e2b39..ed3186c 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..9171e0bbef 100644 --- a/meta/recipes-gnome/epiphany/files/migrator.patch +++ b/meta/recipes-gnome/epiphany/files/migrator.patch @@ -1,3 +1,8 @@ +From f9891e91a4fc3dd903d375573825ece80512fff4 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. @@ -5,11 +10,15 @@ do use the target paths. Upstream-Status: Pending RP 2021/2/25 -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 +--- + lib/ephy-profile-utils.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +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