summaryrefslogtreecommitdiffstats
path: root/meta
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 18:05:39 +0000
commiteb3b60d50570081812dc6b6d8b1a11b723e61813 (patch)
tree2451f303d62dbed7ae698faeff0d9c7926c5aec5 /meta
parentc2f72f6cb7646757bf0dc7e16b4e0715025b7df2 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-gnome/epiphany/epiphany_3.26.5.1.bb (renamed from meta/recipes-gnome/epiphany/epiphany_3.24.3.bb)15
-rw-r--r--meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch32
-rw-r--r--meta/recipes-gnome/epiphany/files/0001-yelp.m4-drop-the-check-for-itstool.patch33
-rw-r--r--meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch34
4 files changed, 40 insertions, 74 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.24.3.bb b/meta/recipes-gnome/epiphany/epiphany_3.26.5.1.bb
index c507d23ae9..eee53c6015 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.24.3.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.26.5.1.bb
@@ -6,20 +6,17 @@ DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \
6 gsettings-desktop-schemas gnome-desktop3 libxml2-native \ 6 gsettings-desktop-schemas gnome-desktop3 libxml2-native \
7 glib-2.0 glib-2.0-native json-glib" 7 glib-2.0 glib-2.0-native json-glib"
8 8
9GNOMEBASEBUILDCLASS = "meson"
9inherit gnomebase gsettings distro_features_check upstream-version-is-even gettext 10inherit gnomebase gsettings distro_features_check upstream-version-is-even gettext
10REQUIRED_DISTRO_FEATURES = "x11" 11REQUIRED_DISTRO_FEATURES = "x11"
11 12
12SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch \ 13SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
13 file://0001-bookmarks-Check-for-return-value-of-fread.patch \ 14 file://0002-help-meson.build-disable-the-use-of-yelp.patch \
14 " 15 "
15SRC_URI[archive.md5sum] = "c0221aec6a08935e6854eaa9de9451ef" 16SRC_URI[archive.md5sum] = "8c2062debde6377320596e2685bb1732"
16SRC_URI[archive.sha256sum] = "fef51676310d9f37e18c9b2d778254232eb17cccd988c2d1ecf42c7b2963a154" 17SRC_URI[archive.sha256sum] = "4b2f1c48e6f50793ff205d9215add5596ab5c7ebf4cef76907868fcd5a029221"
17 18
18EXTRA_OECONF += " --with-distributor-name=${DISTRO} --enable-debug=no" 19EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}"
19
20do_configure_prepend() {
21 sed -i -e s:help::g ${S}/Makefile.am
22}
23 20
24FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers" 21FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers"
25RDEPENDS_${PN} = "iso-codes adwaita-icon-theme" 22RDEPENDS_${PN} = "iso-codes adwaita-icon-theme"
diff --git a/meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch b/meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch
deleted file mode 100644
index ddcd39400c..0000000000
--- a/meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From aa2176be32eed2578da82f34d31148f934c11c34 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 28 Jun 2017 17:03:45 -0700
4Subject: [PATCH] bookmarks: Check for return value of fread()
5
6Fixes below compiler error
7ignoring return value of 'fread', declared with attribute warn_unused_result
8
9Upstream-Status: Pending
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 src/bookmarks/ephy-bookmark.c | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
15
16diff --git a/src/bookmarks/ephy-bookmark.c b/src/bookmarks/ephy-bookmark.c
17index ff0239b..8633ce4 100644
18--- a/src/bookmarks/ephy-bookmark.c
19+++ b/src/bookmarks/ephy-bookmark.c
20@@ -217,7 +217,8 @@ ephy_bookmark_init (EphyBookmark *self)
21 bytes = g_malloc (num_bytes);
22
23 fp = fopen ("/dev/urandom", "r");
24- fread (bytes, sizeof (guint8), num_bytes, fp);
25+ if (fread (bytes, sizeof (guint8), num_bytes, fp) != num_bytes)
26+ g_warning("Unable to read data from /dev/urandom\n");
27
28 self->id = g_malloc0 (ID_LEN + 1);
29 for (gsize i = 0; i < num_bytes; i++) {
30--
312.13.2
32
diff --git a/meta/recipes-gnome/epiphany/files/0001-yelp.m4-drop-the-check-for-itstool.patch b/meta/recipes-gnome/epiphany/files/0001-yelp.m4-drop-the-check-for-itstool.patch
deleted file mode 100644
index 2585d7f741..0000000000
--- a/meta/recipes-gnome/epiphany/files/0001-yelp.m4-drop-the-check-for-itstool.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 30f03a256efe375a4d5c3a24bf4168ebf380e3ab Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 30 Jul 2015 15:13:23 +0300
4Subject: [PATCH] yelp.m4: drop the check for itstool
5
6It isn't used for anything during build, so there's no need to provide
7it as a recipe.
8
9Upstream-Status: Inappropriate [tarball-specific issue]
10---
11 m4/yelp.m4 | 6 ------
12 1 file changed, 6 deletions(-)
13
14diff --git a/m4/yelp.m4 b/m4/yelp.m4
15index 5db847f..1b6ede4 100644
16--- a/m4/yelp.m4
17+++ b/m4/yelp.m4
18@@ -27,12 +27,6 @@ AC_ARG_WITH([help-dir],
19 HELP_DIR="$with_help_dir"
20 AC_SUBST(HELP_DIR)
21
22-AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command])
23-AC_CHECK_PROG([ITSTOOL], [itstool], [itstool])
24-if test x"$ITSTOOL" = x; then
25- AC_MSG_ERROR([itstool not found])
26-fi
27-
28 AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command])
29 AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint])
30 if test x"$XMLLINT" = x; then
31--
322.1.4
33
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 @@
1From fc314fc3a66c92fe73e1a0cea4f49d11b29e1f45 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 31 Jan 2018 15:50:38 +0200
4Subject: [PATCH 2/2] help/meson.build: disable the use of yelp
5
6In particular this avoids calling itstool which oe-core doesn't provide.
7
8Upstream-Status: Inappropriate [oe-core specific]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 help/meson.build | 10 +++++-----
12 1 file changed, 5 insertions(+), 5 deletions(-)
13
14diff --git a/help/meson.build b/help/meson.build
15index 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--
332.15.1
34