diff options
author | 2018-04-04 14:13:11 +0300 | |
---|---|---|
committer | 2018-05-04 09:54:51 +0100 | |
commit | 35fb1c0d635bb714e6b46a102bc78e539d8cd3f1 (patch) | |
tree | a20a7507ad66754f38a8ab40ea89c6af3d41af88 | |
parent | 39c78dbc67acd3e5cc6a38d11a5a26e0a0c72d61 (diff) | |
download | openembedded-core-35fb1c0d635bb714e6b46a102bc78e539d8cd3f1.tar.gz |
epiphany: update to 3.28.0.1
Rebase 0002-help-meson.build-disable-the-use-of-yelp.patch.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-gnome/epiphany/epiphany_3.28.0.1.bb (renamed from meta/recipes-gnome/epiphany/epiphany_3.26.6.bb) | 6 | ||||
-rw-r--r-- | meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch | 20 |
2 files changed, 11 insertions, 15 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.26.6.bb b/meta/recipes-gnome/epiphany/epiphany_3.28.0.1.bb index e250f76ed1..c878ee3229 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.26.6.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.28.0.1.bb @@ -13,10 +13,10 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.md5sum] = "8449968366a6f9aaff3ac228ddfc7c66" -SRC_URI[archive.sha256sum] = "01b16aa55d312ae0f17d3136f90d8c68ac748715f119412fb1917023c6f630a8" +SRC_URI[archive.md5sum] = "3e127d843d3f255f426ab34804f29163" +SRC_URI[archive.sha256sum] = "7154b06837655771f2240bf378fb8ba2315ae07dbc6f45d160ca29cd6d377808" EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}" -FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers" +FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS_${PN} = "iso-codes adwaita-icon-theme" 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 249517d8f9..d4f3cc1d35 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,34 +1,30 @@ -From fc314fc3a66c92fe73e1a0cea4f49d11b29e1f45 Mon Sep 17 00:00:00 2001 +From 0048ae2d225d25cc58f378718ca6f9ddb1a228f9 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 31 Jan 2018 15:50:38 +0200 -Subject: [PATCH 2/2] help/meson.build: disable the use of yelp +Subject: [PATCH] help/meson.build: disable the use of yelp In particular this avoids calling itstool which oe-core doesn't provide. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- - help/meson.build | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + help/meson.build | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/help/meson.build b/help/meson.build -index f720add..cbfeb1e 100644 +index fddcf4c..f7d76c6 100644 --- a/help/meson.build +++ b/help/meson.build -@@ -46,8 +46,8 @@ help_linguas = [ - 'sv' +@@ -32,7 +32,7 @@ help_media = [ + 'media/web-browser.png' ] -gnome.yelp(meson.project_name(), - sources: help_files, - media: help_media, -- languages: help_linguas, -) +#gnome.yelp(meson.project_name(), +# sources: help_files, +# media: help_media, -+# languages: help_linguas, +#) --- -2.15.1 - |