summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-10-28 22:05:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-10-30 13:22:49 +0000
commitd3a464fd74b1acd27b82d7cfc645a59baf70c532 (patch)
tree18b7d5fe31edab60bc37690bf2940a74f891dbee
parent0ec584a236d70229d528037accfc9aa19a3f9f14 (diff)
downloadpoky-d3a464fd74b1acd27b82d7cfc645a59baf70c532.tar.gz
epiphany: upgrade 3.36.4 -> 3.38.1
libportal is a new hard dependency. (From OE-Core rev: 118dbb137adb11a8d92bdbf60ab3696176d64aa0) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/epiphany/epiphany_3.38.1.bb (renamed from meta/recipes-gnome/epiphany/epiphany_3.36.4.bb)4
-rw-r--r--meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch6
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.36.4.bb b/meta/recipes-gnome/epiphany/epiphany_3.38.1.bb
index 4c3b18331a..f9daa8bfe2 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.36.4.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.38.1.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
5 5
6DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ 6DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \
7 gsettings-desktop-schemas libxml2-native \ 7 gsettings-desktop-schemas libxml2-native \
8 glib-2.0 glib-2.0-native json-glib libdazzle libhandy" 8 glib-2.0 glib-2.0-native json-glib libdazzle libhandy libportal"
9 9
10GNOMEBASEBUILDCLASS = "meson" 10GNOMEBASEBUILDCLASS = "meson"
11inherit gnomebase gsettings features_check upstream-version-is-even gettext mime-xdg 11inherit gnomebase gsettings features_check upstream-version-is-even gettext mime-xdg
@@ -14,7 +14,7 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
14SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ 14SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
15 file://0002-help-meson.build-disable-the-use-of-yelp.patch \ 15 file://0002-help-meson.build-disable-the-use-of-yelp.patch \
16 " 16 "
17SRC_URI[archive.sha256sum] = "588a75b1588f5a509c33cf0be6a38a0f4fc1748eeb499a51d991ddef485242bf" 17SRC_URI[archive.sha256sum] = "59b7576acb11fbb52eaca6dbf6fce28664de5c915ca2580c47f0b08ba83d2843"
18 18
19FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" 19FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
20RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" 20RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
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 d4f3cc1d35..118b5d1825 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 @@
1From 0048ae2d225d25cc58f378718ca6f9ddb1a228f9 Mon Sep 17 00:00:00 2001 1From 3725c254f1d1d8204fa299e71c1e2bfd0ff6a634 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 31 Jan 2018 15:50:38 +0200 3Date: Wed, 31 Jan 2018 15:50:38 +0200
4Subject: [PATCH] help/meson.build: disable the use of yelp 4Subject: [PATCH] help/meson.build: disable the use of yelp
@@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 1 file changed, 4 insertions(+), 4 deletions(-) 13 1 file changed, 4 insertions(+), 4 deletions(-)
14 14
15diff --git a/help/meson.build b/help/meson.build 15diff --git a/help/meson.build b/help/meson.build
16index fddcf4c..f7d76c6 100644 16index 484860c..d9b2e80 100644
17--- a/help/meson.build 17--- a/help/meson.build
18+++ b/help/meson.build 18+++ b/help/meson.build
19@@ -32,7 +32,7 @@ help_media = [ 19@@ -32,7 +32,7 @@ help_media = [
20 'media/web-browser.png' 20 'media/epiphany-private-3-36.png'
21 ] 21 ]
22 22
23-gnome.yelp(meson.project_name(), 23-gnome.yelp(meson.project_name(),