aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-02-01 20:01:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-16 17:56:33 +0000
commit5d6b91bf124831eae46e2531155357bbe18e353a (patch)
treecb9008e35d8b34098f364b3a7f6b30dfca1e8654 /meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
parentef7dac8511fc1647bc481c0e2ffa19e08e06f007 (diff)
downloadopenembedded-core-contrib-5d6b91bf124831eae46e2531155357bbe18e353a.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 Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
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.patch34
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 @@
+From fc314fc3a66c92fe73e1a0cea4f49d11b29e1f45 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
+
+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(-)
+
+diff --git a/help/meson.build b/help/meson.build
+index f720add..cbfeb1e 100644
+--- a/help/meson.build
++++ b/help/meson.build
+@@ -46,8 +46,8 @@ help_linguas = [
+ 'sv'
+ ]
+
+-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
+