summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2013-10-15 14:51:05 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-16 13:33:59 +0100
commit68a41d2afd3392c59f78398913aa3855225cc52d (patch)
tree3e496339881d2c249131e102ff55b658fad9f822 /meta/recipes-core
parent40420b90062f0a34cc63f7308a0b153455c9f224 (diff)
downloadpoky-68a41d2afd3392c59f78398913aa3855225cc52d.tar.gz
glib-2.0: fix build on Aarch64
Backported patch from upstream (From OE-Core rev: 3a6032a422f1dfcd72995cad9cbe3638edb94cab) Signed-off-by: Riku Voipio <riku.voipio@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch56
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb1
2 files changed, 57 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch
new file mode 100644
index 0000000000..9b87d9d547
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch
@@ -0,0 +1,56 @@
1From 0167c3340d8201dca8e9031b61703bbc5ed6ce33 Mon Sep 17 00:00:00 2001
2From: Jan Schmidt <thaytan@noraisin.net>
3Date: Wed, 25 Sep 2013 19:22:26 +1000
4Subject: [PATCH] gio: Fix -Werror format string errors from mismatched ints.
5
6Upstream-Status: Backport
7
8---
9 gio/gdbusmessage.c | 8 ++++----
10 gio/gdbusprivate.c | 4 ++--
11 2 files changed, 6 insertions(+), 6 deletions(-)
12
13diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
14index ac233a3..ad77aa6 100644
15--- a/gio/gdbusmessage.c
16+++ b/gio/gdbusmessage.c
17@@ -3468,10 +3468,10 @@ g_dbus_message_print (GDBusMessage *message,
18 statbuf.st_mode);
19 g_string_append_printf (fs, "%s" "ino=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
20 (guint64) statbuf.st_ino);
21- g_string_append_printf (fs, "%s" "uid=%d", fs->len > 0 ? "," : "",
22- statbuf.st_uid);
23- g_string_append_printf (fs, "%s" "gid=%d", fs->len > 0 ? "," : "",
24- statbuf.st_gid);
25+ g_string_append_printf (fs, "%s" "uid=%u", fs->len > 0 ? "," : "",
26+ (guint) statbuf.st_uid);
27+ g_string_append_printf (fs, "%s" "gid=%u", fs->len > 0 ? "," : "",
28+ (guint) statbuf.st_gid);
29 g_string_append_printf (fs, "%s" "rdev=%d:%d", fs->len > 0 ? "," : "",
30 major (statbuf.st_rdev), minor (statbuf.st_rdev));
31 g_string_append_printf (fs, "%s" "size=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
32diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
33index 0e5bef2..785a0c0 100644
34--- a/gio/gdbusprivate.c
35+++ b/gio/gdbusprivate.c
36@@ -2155,7 +2155,7 @@ write_message_print_transport_debug (gssize bytes_written,
37 _g_dbus_debug_print_lock ();
38 g_print ("========================================================================\n"
39 "GDBus-debug:Transport:\n"
40- " >>>> WROTE %" G_GSIZE_FORMAT " bytes of message with serial %d and\n"
41+ " >>>> WROTE %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n"
42 " size %" G_GSIZE_FORMAT " from offset %" G_GSIZE_FORMAT " on a %s\n",
43 bytes_written,
44 g_dbus_message_get_serial (data->message),
45@@ -2206,7 +2206,7 @@ read_message_print_transport_debug (gssize bytes_read,
46 _g_dbus_debug_print_lock ();
47 g_print ("========================================================================\n"
48 "GDBus-debug:Transport:\n"
49- " <<<< READ %" G_GSIZE_FORMAT " bytes of message with serial %d and\n"
50+ " <<<< READ %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n"
51 " size %d to offset %" G_GSIZE_FORMAT " from a %s\n",
52 bytes_read,
53 serial,
54--
551.8.3.1
56
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb
index 4b9b1129e2..5717bd233b 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb
@@ -14,6 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
14 file://add-march-i486-into-CFLAGS-automatically.patch \ 14 file://add-march-i486-into-CFLAGS-automatically.patch \
15 file://glib-2.0-configure-readlink.patch \ 15 file://glib-2.0-configure-readlink.patch \
16 file://run-ptest \ 16 file://run-ptest \
17 file://0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch \
17 " 18 "
18 19
19SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" 20SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"