From 36965634bea2d22bc2ee923d8ab595abb7631a88 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 6 Mar 2024 07:42:07 -0800 Subject: epiphany: upgrade 45.1 -> 45.3 (From OE-Core rev: 7d96a1c77147a08d39b98de6b619cfe5e5c0338c) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-gnome/epiphany/epiphany_45.1.bb | 43 ---------------------- meta/recipes-gnome/epiphany/epiphany_45.3.bb | 43 ++++++++++++++++++++++ ...-help-meson.build-disable-the-use-of-yelp.patch | 3 +- .../recipes-gnome/epiphany/files/distributor.patch | 17 ++++++--- meta/recipes-gnome/epiphany/files/migrator.patch | 18 ++++++--- 5 files changed, 69 insertions(+), 55 deletions(-) delete mode 100644 meta/recipes-gnome/epiphany/epiphany_45.1.bb create mode 100644 meta/recipes-gnome/epiphany/epiphany_45.3.bb (limited to 'meta/recipes-gnome/epiphany') diff --git a/meta/recipes-gnome/epiphany/epiphany_45.1.bb b/meta/recipes-gnome/epiphany/epiphany_45.1.bb deleted file mode 100644 index c8631e05e9..0000000000 --- a/meta/recipes-gnome/epiphany/epiphany_45.1.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "WebKit based web browser for GNOME" -DESCRIPTION = "Epiphany is an open source web browser for the Linux desktop environment. \ -It provides a simple and easy-to-use internet browsing experience." -HOMEPAGE = "https://wiki.gnome.org/Apps/Web" -BUGTRACKER = "https://gitlab.gnome.org/GNOME/epiphany" -LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = " \ - webkitgtk \ - gcr \ - gsettings-desktop-schemas \ - nettle \ - json-glib \ - libadwaita \ - libarchive \ - libdazzle \ - libhandy \ - libportal \ - libsoup \ - glib-2.0-native \ - coreutils-native \ - desktop-file-utils-native \ - " - -inherit gnomebase gsettings features_check gettext mime-xdg gtk-icon-cache -REQUIRED_DISTRO_FEATURES = "x11 opengl" - -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ - file://0002-help-meson.build-disable-the-use-of-yelp.patch \ - file://migrator.patch \ - file://distributor.patch \ - " -SRC_URI[archive.sha256sum] = "7c994ef34ecd60e915de331ee123c08938f9623cefada6d50b99e3c9c5ad8135" - -# Developer mode enables debugging -PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" - -FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" -RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" - -# ANGLE requires SSE support as of webkit 2.40.x on 32 bit x86 -COMPATIBLE_HOST:x86 = "${@bb.utils.contains_any('TUNE_FEATURES', 'core2 corei7', '.*', 'null', d)}" diff --git a/meta/recipes-gnome/epiphany/epiphany_45.3.bb b/meta/recipes-gnome/epiphany/epiphany_45.3.bb new file mode 100644 index 0000000000..eec52e321a --- /dev/null +++ b/meta/recipes-gnome/epiphany/epiphany_45.3.bb @@ -0,0 +1,43 @@ +SUMMARY = "WebKit based web browser for GNOME" +DESCRIPTION = "Epiphany is an open source web browser for the Linux desktop environment. \ +It provides a simple and easy-to-use internet browsing experience." +HOMEPAGE = "https://wiki.gnome.org/Apps/Web" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/epiphany" +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = " \ + webkitgtk \ + gcr \ + gsettings-desktop-schemas \ + nettle \ + json-glib \ + libadwaita \ + libarchive \ + libdazzle \ + libhandy \ + libportal \ + libsoup \ + glib-2.0-native \ + coreutils-native \ + desktop-file-utils-native \ + " + +inherit gnomebase gsettings features_check gettext mime-xdg gtk-icon-cache +REQUIRED_DISTRO_FEATURES = "x11 opengl" + +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ + file://0002-help-meson.build-disable-the-use-of-yelp.patch \ + file://migrator.patch \ + file://distributor.patch \ + " +SRC_URI[archive.sha256sum] = "6c302e9bdd66290cb0e26f62843cd4c435a4955abdbb4f151f07dc80495d6730" + +# Developer mode enables debugging +PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" + +FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" +RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" + +# ANGLE requires SSE support as of webkit 2.40.x on 32 bit x86 +COMPATIBLE_HOST:x86 = "${@bb.utils.contains_any('TUNE_FEATURES', 'core2 corei7', '.*', 'null', d)}" 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 -- cgit v1.2.3-54-g00ecf