diff options
Diffstat (limited to 'meta/recipes-gnome/epiphany')
-rw-r--r-- | meta/recipes-gnome/epiphany/epiphany_3.24.2.bb | 6 | ||||
-rw-r--r-- | meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch | 32 |
2 files changed, 36 insertions, 2 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.24.2.bb b/meta/recipes-gnome/epiphany/epiphany_3.24.2.bb index 77c19331cb..dafad8a793 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.24.2.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.24.2.bb | |||
@@ -9,11 +9,13 @@ DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ | |||
9 | inherit gnomebase gsettings distro_features_check upstream-version-is-even gettext | 9 | inherit gnomebase gsettings distro_features_check upstream-version-is-even gettext |
10 | REQUIRED_DISTRO_FEATURES = "x11" | 10 | REQUIRED_DISTRO_FEATURES = "x11" |
11 | 11 | ||
12 | SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch" | 12 | SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch \ |
13 | file://0001-bookmarks-Check-for-return-value-of-fread.patch \ | ||
14 | " | ||
13 | SRC_URI[archive.md5sum] = "e035dc6f64f0c1909de823e03f16b2f3" | 15 | SRC_URI[archive.md5sum] = "e035dc6f64f0c1909de823e03f16b2f3" |
14 | SRC_URI[archive.sha256sum] = "5abc0d0c60591df5236ac9b8979dc9f7d9acbb8ad0902b4772d2b7beea81c58d" | 16 | SRC_URI[archive.sha256sum] = "5abc0d0c60591df5236ac9b8979dc9f7d9acbb8ad0902b4772d2b7beea81c58d" |
15 | 17 | ||
16 | EXTRA_OECONF += " --with-distributor-name=${DISTRO}" | 18 | EXTRA_OECONF += " --with-distributor-name=${DISTRO} --enable-debug=no" |
17 | 19 | ||
18 | do_configure_prepend() { | 20 | do_configure_prepend() { |
19 | sed -i -e s:help::g ${S}/Makefile.am | 21 | sed -i -e s:help::g ${S}/Makefile.am |
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 new file mode 100644 index 0000000000..ddcd39400c --- /dev/null +++ b/meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From aa2176be32eed2578da82f34d31148f934c11c34 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 28 Jun 2017 17:03:45 -0700 | ||
4 | Subject: [PATCH] bookmarks: Check for return value of fread() | ||
5 | |||
6 | Fixes below compiler error | ||
7 | ignoring return value of 'fread', declared with attribute warn_unused_result | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-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 | |||
16 | diff --git a/src/bookmarks/ephy-bookmark.c b/src/bookmarks/ephy-bookmark.c | ||
17 | index 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 | -- | ||
31 | 2.13.2 | ||
32 | |||