From 40d55d80ca307637aaa6d70e8fe1749aeec284b9 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 7 Apr 2022 19:00:25 +0200 Subject: epiphany: upgrade 41.3 -> 42.0 The new version uses printenv from coreutils during builds. (From OE-Core rev: 1d46d4c1150743a04ddf3d9936e431b487676043) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-gnome/epiphany/epiphany_41.3.bb | 43 ---------------------- meta/recipes-gnome/epiphany/epiphany_42.0.bb | 43 ++++++++++++++++++++++ .../bfbb5f7bab38301d8a4a444173acdae8d9692146.patch | 35 ------------------ 3 files changed, 43 insertions(+), 78 deletions(-) delete mode 100644 meta/recipes-gnome/epiphany/epiphany_41.3.bb create mode 100644 meta/recipes-gnome/epiphany/epiphany_42.0.bb delete mode 100644 meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch (limited to 'meta/recipes-gnome/epiphany') diff --git a/meta/recipes-gnome/epiphany/epiphany_41.3.bb b/meta/recipes-gnome/epiphany/epiphany_41.3.bb deleted file mode 100644 index 6dca6a7305..0000000000 --- a/meta/recipes-gnome/epiphany/epiphany_41.3.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 \ - libarchive \ - libdazzle \ - libhandy \ - glib-2.0-native \ - " - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings features_check gettext mime-xdg -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://bfbb5f7bab38301d8a4a444173acdae8d9692146.patch \ - file://migrator.patch \ - file://distributor.patch \ - " -SRC_URI[archive.sha256sum] = "ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad" - -PACKAGECONFIG_SOUP ?= "soup2" -PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" - -# Developer mode enables debugging -PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" -PACKAGECONFIG[soup2] = "-Dsoup2=enabled,-Dsoup2=disabled,libsoup-2.4,,,soup3" -PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" -PACKAGECONFIG[libportal] = "-Dlibportal=enabled,-Dlibportal=disabled,libportal" - -FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" -RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" diff --git a/meta/recipes-gnome/epiphany/epiphany_42.0.bb b/meta/recipes-gnome/epiphany/epiphany_42.0.bb new file mode 100644 index 0000000000..1cf731c7d6 --- /dev/null +++ b/meta/recipes-gnome/epiphany/epiphany_42.0.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 \ + libarchive \ + libdazzle \ + libhandy \ + glib-2.0-native \ + coreutils-native \ + " + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gsettings features_check gettext mime-xdg +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] = "3dbfa8c00e45b7f44e1824d01f0febe83707b5fb9330c261173f68b7f03cd5e3" + +PACKAGECONFIG_SOUP ?= "soup2" +PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" + +# Developer mode enables debugging +PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" +PACKAGECONFIG[soup2] = "-Dsoup2=enabled,-Dsoup2=disabled,libsoup-2.4,,,soup3" +PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" +PACKAGECONFIG[libportal] = "-Dlibportal=enabled,-Dlibportal=disabled,libportal" + +FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" +RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" diff --git a/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch b/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch deleted file mode 100644 index f20975c3bd..0000000000 --- a/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch +++ /dev/null @@ -1,35 +0,0 @@ -From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001 -From: rvalue -Date: Wed, 24 Nov 2021 04:52:42 +0000 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -Part-of: -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 46df3fd80..eac6b8224 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -16,7 +16,6 @@ install_data( - desktop_conf = configuration_data() - desktop_conf.set('icon', application_id) - desktop = i18n.merge_file( -- 'desktop', - input: configure_file( - input: files('org.gnome.Epiphany.desktop.in.in'), - output: 'org.gnome.Epiphany.desktop.in', -@@ -32,7 +31,6 @@ desktop = i18n.merge_file( - appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: files('org.gnome.Epiphany.appdata.xml.in.in'), - output: 'org.gnome.Epiphany.appdata.xml.in', --- -GitLab - -- cgit v1.2.3-54-g00ecf