diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-02-01 20:01:56 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-16 18:05:39 +0000 |
commit | eb3b60d50570081812dc6b6d8b1a11b723e61813 (patch) | |
tree | 2451f303d62dbed7ae698faeff0d9c7926c5aec5 /meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch | |
parent | c2f72f6cb7646757bf0dc7e16b4e0715025b7df2 (diff) | |
download | poky-eb3b60d50570081812dc6b6d8b1a11b723e61813.tar.gz |
epiphany: update to 3.26.5.1
Upstream has replaced autotools with meson, so the recipe has been adjusted accordingly.
0001-bookmarks-Check-for-return-value-of-fread.patch deleted as the file was completely refactored
0001-yelp.m4-drop-the-check-for-itstool.patch replaced with a patch for meson equivalent
(From OE-Core rev: 5d6b91bf124831eae46e2531155357bbe18e353a)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch')
-rw-r--r-- | meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch | 34 |
1 files changed, 34 insertions, 0 deletions
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 new file mode 100644 index 0000000000..249517d8f9 --- /dev/null +++ b/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From fc314fc3a66c92fe73e1a0cea4f49d11b29e1f45 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 31 Jan 2018 15:50:38 +0200 | ||
4 | Subject: [PATCH 2/2] help/meson.build: disable the use of yelp | ||
5 | |||
6 | In particular this avoids calling itstool which oe-core doesn't provide. | ||
7 | |||
8 | Upstream-Status: Inappropriate [oe-core specific] | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- | ||
11 | help/meson.build | 10 +++++----- | ||
12 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
13 | |||
14 | diff --git a/help/meson.build b/help/meson.build | ||
15 | index f720add..cbfeb1e 100644 | ||
16 | --- a/help/meson.build | ||
17 | +++ b/help/meson.build | ||
18 | @@ -46,8 +46,8 @@ help_linguas = [ | ||
19 | 'sv' | ||
20 | ] | ||
21 | |||
22 | -gnome.yelp(meson.project_name(), | ||
23 | - sources: help_files, | ||
24 | - media: help_media, | ||
25 | - languages: help_linguas, | ||
26 | -) | ||
27 | +#gnome.yelp(meson.project_name(), | ||
28 | +# sources: help_files, | ||
29 | +# media: help_media, | ||
30 | +# languages: help_linguas, | ||
31 | +#) | ||
32 | -- | ||
33 | 2.15.1 | ||
34 | |||