mirror of
https://git.yoctoproject.org/poky
synced 2026-02-27 03:49:41 +01:00
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>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
c2f72f6cb7
commit
eb3b60d505
@@ -6,20 +6,17 @@ DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \
|
||||
gsettings-desktop-schemas gnome-desktop3 libxml2-native \
|
||||
glib-2.0 glib-2.0-native json-glib"
|
||||
|
||||
GNOMEBASEBUILDCLASS = "meson"
|
||||
inherit gnomebase gsettings distro_features_check upstream-version-is-even gettext
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch \
|
||||
file://0001-bookmarks-Check-for-return-value-of-fread.patch \
|
||||
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] = "c0221aec6a08935e6854eaa9de9451ef"
|
||||
SRC_URI[archive.sha256sum] = "fef51676310d9f37e18c9b2d778254232eb17cccd988c2d1ecf42c7b2963a154"
|
||||
SRC_URI[archive.md5sum] = "8c2062debde6377320596e2685bb1732"
|
||||
SRC_URI[archive.sha256sum] = "4b2f1c48e6f50793ff205d9215add5596ab5c7ebf4cef76907868fcd5a029221"
|
||||
|
||||
EXTRA_OECONF += " --with-distributor-name=${DISTRO} --enable-debug=no"
|
||||
|
||||
do_configure_prepend() {
|
||||
sed -i -e s:help::g ${S}/Makefile.am
|
||||
}
|
||||
EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}"
|
||||
|
||||
FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers"
|
||||
RDEPENDS_${PN} = "iso-codes adwaita-icon-theme"
|
||||
@@ -1,32 +0,0 @@
|
||||
From aa2176be32eed2578da82f34d31148f934c11c34 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 28 Jun 2017 17:03:45 -0700
|
||||
Subject: [PATCH] bookmarks: Check for return value of fread()
|
||||
|
||||
Fixes below compiler error
|
||||
ignoring return value of 'fread', declared with attribute warn_unused_result
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/bookmarks/ephy-bookmark.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/bookmarks/ephy-bookmark.c b/src/bookmarks/ephy-bookmark.c
|
||||
index ff0239b..8633ce4 100644
|
||||
--- a/src/bookmarks/ephy-bookmark.c
|
||||
+++ b/src/bookmarks/ephy-bookmark.c
|
||||
@@ -217,7 +217,8 @@ ephy_bookmark_init (EphyBookmark *self)
|
||||
bytes = g_malloc (num_bytes);
|
||||
|
||||
fp = fopen ("/dev/urandom", "r");
|
||||
- fread (bytes, sizeof (guint8), num_bytes, fp);
|
||||
+ if (fread (bytes, sizeof (guint8), num_bytes, fp) != num_bytes)
|
||||
+ g_warning("Unable to read data from /dev/urandom\n");
|
||||
|
||||
self->id = g_malloc0 (ID_LEN + 1);
|
||||
for (gsize i = 0; i < num_bytes; i++) {
|
||||
--
|
||||
2.13.2
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From 30f03a256efe375a4d5c3a24bf4168ebf380e3ab Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 30 Jul 2015 15:13:23 +0300
|
||||
Subject: [PATCH] yelp.m4: drop the check for itstool
|
||||
|
||||
It isn't used for anything during build, so there's no need to provide
|
||||
it as a recipe.
|
||||
|
||||
Upstream-Status: Inappropriate [tarball-specific issue]
|
||||
---
|
||||
m4/yelp.m4 | 6 ------
|
||||
1 file changed, 6 deletions(-)
|
||||
|
||||
diff --git a/m4/yelp.m4 b/m4/yelp.m4
|
||||
index 5db847f..1b6ede4 100644
|
||||
--- a/m4/yelp.m4
|
||||
+++ b/m4/yelp.m4
|
||||
@@ -27,12 +27,6 @@ AC_ARG_WITH([help-dir],
|
||||
HELP_DIR="$with_help_dir"
|
||||
AC_SUBST(HELP_DIR)
|
||||
|
||||
-AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command])
|
||||
-AC_CHECK_PROG([ITSTOOL], [itstool], [itstool])
|
||||
-if test x"$ITSTOOL" = x; then
|
||||
- AC_MSG_ERROR([itstool not found])
|
||||
-fi
|
||||
-
|
||||
AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command])
|
||||
AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint])
|
||||
if test x"$XMLLINT" = x; then
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user