summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorDerek Straka <derek@asterius.io>2016-06-22 16:16:12 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2016-06-23 15:20:06 +0200
commit979760c69b41a4ecb67776278a1c248111ad5515 (patch)
tree74f44a99cd0ee1bafa2da26abf2dd09bead8c5ad /meta-gnome
parent675d1df2efe89bd22cab9e0206e86d5554b443e9 (diff)
downloadmeta-openembedded-979760c69b41a4ecb67776278a1c248111ad5515.tar.gz
evince: fix build errors with gcc-6
Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/evince/evince/0002-fix-gcc6-errors.patch39
-rw-r--r--meta-gnome/recipes-gnome/evince/evince_3.18.2.bb4
2 files changed, 42 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/evince/evince/0002-fix-gcc6-errors.patch b/meta-gnome/recipes-gnome/evince/evince/0002-fix-gcc6-errors.patch
new file mode 100644
index 000000000..b8e30f7d9
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evince/evince/0002-fix-gcc6-errors.patch
@@ -0,0 +1,39 @@
1--- evince-3.18.2/backend/comics/comics-document.c.orig 2016-06-22 20:08:01.789805750 +0000
2+++ evince-3.18.2/backend/comics/comics-document.c 2016-06-22 20:07:00.817804688 +0000
3@@ -241,6 +241,8 @@
4 /* This function shows how to use the choosen command for decompressing a
5 * comic book file. It modifies fields of the ComicsDocument struct with
6 * this information */
7+#pragma GCC diagnostic push
8+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
9 static gboolean
10 comics_generate_command_lines (ComicsDocument *comics_document,
11 GError **error)
12@@ -296,6 +298,7 @@
13 }
14
15 }
16+#pragma GCC diagnostic pop
17
18 /* This function chooses an external command for decompressing a comic
19 * book based on its mime tipe. */
20--- evince-3.18.2/libdocument/ev-document-misc.c.orig 2016-06-22 20:01:49.205799262 +0000
21+++ evince-3.18.2/libdocument/ev-document-misc.c 2016-06-22 20:02:27.233799924 +0000
22@@ -519,7 +519,8 @@
23
24 return (dp / di);
25 }
26-
27+#pragma GCC diagnostic push
28+#pragma GCC diagnostic ignored "-Wformat-y2k"
29 /* Returns a locale specific date and time representation */
30 gchar *
31 ev_document_misc_format_date (GTime utime)
32@@ -542,6 +543,7 @@
33
34 return g_locale_to_utf8 (s, -1, NULL, NULL, NULL);
35 }
36+#pragma GCC diagnostic pop
37
38 void
39 ev_document_misc_get_pointer_position (GtkWidget *widget,
diff --git a/meta-gnome/recipes-gnome/evince/evince_3.18.2.bb b/meta-gnome/recipes-gnome/evince/evince_3.18.2.bb
index 4fa11a574..76b5e25de 100644
--- a/meta-gnome/recipes-gnome/evince/evince_3.18.2.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_3.18.2.bb
@@ -10,7 +10,9 @@ inherit gnome pkgconfig gtk-icon-cache gsettings gobject-introspection
10SRC_URI[archive.md5sum] = "c39af6b8b1c44d4393ef8ac9dab99c0b" 10SRC_URI[archive.md5sum] = "c39af6b8b1c44d4393ef8ac9dab99c0b"
11SRC_URI[archive.sha256sum] = "42ad6c7354d881a9ecab136ea84ff867acb942605bcfac48b6c12e1c2d8ecb17" 11SRC_URI[archive.sha256sum] = "42ad6c7354d881a9ecab136ea84ff867acb942605bcfac48b6c12e1c2d8ecb17"
12 12
13SRC_URI += "file://0001-help-remove-YELP-macro.patch" 13SRC_URI += "file://0001-help-remove-YELP-macro.patch \
14 file://0002-fix-gcc6-errors.patch \
15"
14 16
15EXTRA_OECONF = " --enable-thumbnailer \ 17EXTRA_OECONF = " --enable-thumbnailer \
16" 18"