summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/libgnome/libgnomeui/0001-suppress-string-format-literal-warning-to-fix-build-.patch78
-rw-r--r--meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb10
-rw-r--r--meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb (renamed from meta-gnome/recipes-gnome/libgnome/libgnomeui.inc)11
3 files changed, 86 insertions, 13 deletions
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui/0001-suppress-string-format-literal-warning-to-fix-build-.patch b/meta-gnome/recipes-gnome/libgnome/libgnomeui/0001-suppress-string-format-literal-warning-to-fix-build-.patch
new file mode 100644
index 000000000..abc9bdfba
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomeui/0001-suppress-string-format-literal-warning-to-fix-build-.patch
@@ -0,0 +1,78 @@
1From 6697fcf9d7f53126b442bf19890640b5f88c8aa4 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 29 Jul 2016 21:24:20 +0200
4Subject: [PATCH] suppress string format literal warning to fix build with gcc6
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9works around:
10| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c: In function 'day_selected':
11| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c:156:9: error: format not a string literal, format string not checked [-Werror=format-nonliteral]
12| strftime_date_format, &mtm) == 0)
13| ^~~~~~~~~~~~~~~~~~~~
14| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c: In function 'gnome_date_edit_set_time':
15| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c:704:2: error: format not a string literal, format string not checked [-Werror=format-nonliteral]
16| if (strftime (buffer, sizeof (buffer), strftime_date_format, mytm) == 0)
17| ^~
18
19Upstream-Status: Pending
20
21Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
22---
23 libgnomeui/gnome-dateedit.c | 6 ++++++
24 libgnomeui/gnome-gconf-ui.c | 3 +++
25 2 files changed, 9 insertions(+)
26
27diff --git a/libgnomeui/gnome-dateedit.c b/libgnomeui/gnome-dateedit.c
28index 69ab699..41541c3 100644
29--- a/libgnomeui/gnome-dateedit.c
30+++ b/libgnomeui/gnome-dateedit.c
31@@ -152,9 +152,12 @@ day_selected (GtkCalendar *calendar, GnomeDateEdit *gde)
32 else
33 mtm.tm_year = year;
34
35+#pragma GCC diagnostic push
36+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
37 if (strftime (buffer, sizeof (buffer),
38 strftime_date_format, &mtm) == 0)
39 strcpy (buffer, "???");
40+#pragma GCC diagnostic pop
41 buffer[sizeof(buffer)-1] = '\0';
42
43 /* FIXME: what about set time */
44@@ -701,8 +704,11 @@ gnome_date_edit_set_time (GnomeDateEdit *gde, time_t the_time)
45 mytm = localtime (&the_time);
46
47 /* Set the date */
48+#pragma GCC diagnostic push
49+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
50 if (strftime (buffer, sizeof (buffer), strftime_date_format, mytm) == 0)
51 strcpy (buffer, "???");
52+#pragma GCC diagnostic pop
53 buffer[sizeof(buffer)-1] = '\0';
54
55 str_utf8 = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
56diff --git a/libgnomeui/gnome-gconf-ui.c b/libgnomeui/gnome-gconf-ui.c
57index 43c0f44..a84b2c0 100644
58--- a/libgnomeui/gnome-gconf-ui.c
59+++ b/libgnomeui/gnome-gconf-ui.c
60@@ -180,12 +180,15 @@ error_idle_func (gpointer data)
61 "configuration settings may not work properly.");
62 }
63
64+#pragma GCC diagnostic push
65+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
66 dialog = gtk_message_dialog_new (NULL /* parent */,
67 0 /* flags */,
68 GTK_MESSAGE_ERROR,
69 GTK_BUTTONS_OK,
70 fmt,
71 gnome_program_get_human_readable_name(gnome_program_get()));
72+#pragma GCC diagnostic pop
73 gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
74 g_signal_connect (dialog, "response",
75 G_CALLBACK (gtk_widget_destroy),
76--
772.5.5
78
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb b/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb
deleted file mode 100644
index 3208a8170..000000000
--- a/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require libgnomeui.inc
2
3PR = "r1"
4
5SRC_URI[archive.md5sum] = "ceab6f4370581d1a03c09f15cc103099"
6SRC_URI[archive.sha256sum] = "04c81f3bb5a337cdf3ed1230916f82d29857ee95eb884f58dd2f5c6860efe803"
7GNOME_COMPRESS_TYPE="bz2"
8
9# http://errors.yoctoproject.org/Errors/Details/68607/
10PNBLACKLIST[libgnomeui] ?= "BROKEN: fails to build with gcc-6"
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc b/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb
index 26997b851..b94f3da79 100644
--- a/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb
@@ -12,13 +12,18 @@ FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
12 ${datadir}/pixmaps/gnome-about-logo.png" 12 ${datadir}/pixmaps/gnome-about-logo.png"
13FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la" 13FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la"
14FILES_${PN}-staticdev += "${libdir}/libglade/*/*.a" 14FILES_${PN}-staticdev += "${libdir}/libglade/*/*.a"
15FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
16 15
17SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch" 16SRC_URI += " \
17 file://0001-suppress-string-format-literal-warning-to-fix-build-.patch \
18 file://gnome-stock-pixbufs.h \
19 file://no-pixbuf-csource.patch \
20"
21SRC_URI[archive.md5sum] = "d4bb506b1916015323928faab5aa708b"
22SRC_URI[archive.sha256sum] = "ae352f2495889e65524c979932c909f4629a58e64290fb0c95333373225d3c0f"
23GNOME_COMPRESS_TYPE="bz2"
18 24
19EXTRA_OECONF = "--disable-gtk-doc" 25EXTRA_OECONF = "--disable-gtk-doc"
20 26
21do_configure_prepend() { 27do_configure_prepend() {
22 install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h 28 install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h
23} 29}
24