diff options
-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" | |||
13 | SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ | 13 | SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ |
14 | file://0002-help-meson.build-disable-the-use-of-yelp.patch \ | 14 | file://0002-help-meson.build-disable-the-use-of-yelp.patch \ |
15 | " | 15 | " |
16 | SRC_URI[archive.md5sum] = "8449968366a6f9aaff3ac228ddfc7c66" | 16 | SRC_URI[archive.md5sum] = "3e127d843d3f255f426ab34804f29163" |
17 | SRC_URI[archive.sha256sum] = "01b16aa55d312ae0f17d3136f90d8c68ac748715f119412fb1917023c6f630a8" | 17 | SRC_URI[archive.sha256sum] = "7154b06837655771f2240bf378fb8ba2315ae07dbc6f45d160ca29cd6d377808" |
18 | 18 | ||
19 | EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}" | 19 | EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}" |
20 | 20 | ||
21 | FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers" | 21 | FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" |
22 | RDEPENDS_${PN} = "iso-codes adwaita-icon-theme" | 22 | 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 @@ | |||
1 | From fc314fc3a66c92fe73e1a0cea4f49d11b29e1f45 Mon Sep 17 00:00:00 2001 | 1 | From 0048ae2d225d25cc58f378718ca6f9ddb1a228f9 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 31 Jan 2018 15:50:38 +0200 | 3 | Date: Wed, 31 Jan 2018 15:50:38 +0200 |
4 | Subject: [PATCH 2/2] help/meson.build: disable the use of yelp | 4 | Subject: [PATCH] help/meson.build: disable the use of yelp |
5 | 5 | ||
6 | In particular this avoids calling itstool which oe-core doesn't provide. | 6 | In particular this avoids calling itstool which oe-core doesn't provide. |
7 | 7 | ||
8 | Upstream-Status: Inappropriate [oe-core specific] | 8 | Upstream-Status: Inappropriate [oe-core specific] |
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
10 | |||
10 | --- | 11 | --- |
11 | help/meson.build | 10 +++++----- | 12 | help/meson.build | 8 ++++---- |
12 | 1 file changed, 5 insertions(+), 5 deletions(-) | 13 | 1 file changed, 4 insertions(+), 4 deletions(-) |
13 | 14 | ||
14 | diff --git a/help/meson.build b/help/meson.build | 15 | diff --git a/help/meson.build b/help/meson.build |
15 | index f720add..cbfeb1e 100644 | 16 | index fddcf4c..f7d76c6 100644 |
16 | --- a/help/meson.build | 17 | --- a/help/meson.build |
17 | +++ b/help/meson.build | 18 | +++ b/help/meson.build |
18 | @@ -46,8 +46,8 @@ help_linguas = [ | 19 | @@ -32,7 +32,7 @@ help_media = [ |
19 | 'sv' | 20 | 'media/web-browser.png' |
20 | ] | 21 | ] |
21 | 22 | ||
22 | -gnome.yelp(meson.project_name(), | 23 | -gnome.yelp(meson.project_name(), |
23 | - sources: help_files, | 24 | - sources: help_files, |
24 | - media: help_media, | 25 | - media: help_media, |
25 | - languages: help_linguas, | ||
26 | -) | 26 | -) |
27 | +#gnome.yelp(meson.project_name(), | 27 | +#gnome.yelp(meson.project_name(), |
28 | +# sources: help_files, | 28 | +# sources: help_files, |
29 | +# media: help_media, | 29 | +# media: help_media, |
30 | +# languages: help_linguas, | ||
31 | +#) | 30 | +#) |
32 | -- | ||
33 | 2.15.1 | ||
34 | |||