diff options
author | Riku Voipio <riku.voipio@linaro.org> | 2013-10-16 16:31:37 +0300 |
---|---|---|
committer | Riku Voipio <riku.voipio@linaro.org> | 2013-10-16 16:32:09 +0300 |
commit | 7dd4e38178fb8df1c793a6a933c371920d6f34d6 (patch) | |
tree | dcec55e30148a370c4aac6145fa3451673ab274e /meta-aarch64/recipes-core | |
parent | a30f01bee79aeef39aa12977744b8f99be4c28dc (diff) |
glib2.0: remove
patch included in oe-core.
Change-Id: I9da14401c0d47dabcfac5df526f7f55214f90e9d
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'meta-aarch64/recipes-core')
-rw-r--r-- | meta-aarch64/recipes-core/glib-2.0/files/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch | 56 | ||||
-rw-r--r-- | meta-aarch64/recipes-core/glib-2.0/glib-2.0_2.38.0.bbappend | 3 |
2 files changed, 0 insertions, 59 deletions
diff --git a/meta-aarch64/recipes-core/glib-2.0/files/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch b/meta-aarch64/recipes-core/glib-2.0/files/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch deleted file mode 100644 index 9b87d9d5..00000000 --- a/meta-aarch64/recipes-core/glib-2.0/files/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0167c3340d8201dca8e9031b61703bbc5ed6ce33 Mon Sep 17 00:00:00 2001 -From: Jan Schmidt <thaytan@noraisin.net> -Date: Wed, 25 Sep 2013 19:22:26 +1000 -Subject: [PATCH] gio: Fix -Werror format string errors from mismatched ints. - -Upstream-Status: Backport - ---- - gio/gdbusmessage.c | 8 ++++---- - gio/gdbusprivate.c | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c -index ac233a3..ad77aa6 100644 ---- a/gio/gdbusmessage.c -+++ b/gio/gdbusmessage.c -@@ -3468,10 +3468,10 @@ g_dbus_message_print (GDBusMessage *message, - statbuf.st_mode); - g_string_append_printf (fs, "%s" "ino=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "", - (guint64) statbuf.st_ino); -- g_string_append_printf (fs, "%s" "uid=%d", fs->len > 0 ? "," : "", -- statbuf.st_uid); -- g_string_append_printf (fs, "%s" "gid=%d", fs->len > 0 ? "," : "", -- statbuf.st_gid); -+ g_string_append_printf (fs, "%s" "uid=%u", fs->len > 0 ? "," : "", -+ (guint) statbuf.st_uid); -+ g_string_append_printf (fs, "%s" "gid=%u", fs->len > 0 ? "," : "", -+ (guint) statbuf.st_gid); - g_string_append_printf (fs, "%s" "rdev=%d:%d", fs->len > 0 ? "," : "", - major (statbuf.st_rdev), minor (statbuf.st_rdev)); - g_string_append_printf (fs, "%s" "size=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "", -diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c -index 0e5bef2..785a0c0 100644 ---- a/gio/gdbusprivate.c -+++ b/gio/gdbusprivate.c -@@ -2155,7 +2155,7 @@ write_message_print_transport_debug (gssize bytes_written, - _g_dbus_debug_print_lock (); - g_print ("========================================================================\n" - "GDBus-debug:Transport:\n" -- " >>>> WROTE %" G_GSIZE_FORMAT " bytes of message with serial %d and\n" -+ " >>>> WROTE %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n" - " size %" G_GSIZE_FORMAT " from offset %" G_GSIZE_FORMAT " on a %s\n", - bytes_written, - g_dbus_message_get_serial (data->message), -@@ -2206,7 +2206,7 @@ read_message_print_transport_debug (gssize bytes_read, - _g_dbus_debug_print_lock (); - g_print ("========================================================================\n" - "GDBus-debug:Transport:\n" -- " <<<< READ %" G_GSIZE_FORMAT " bytes of message with serial %d and\n" -+ " <<<< READ %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n" - " size %d to offset %" G_GSIZE_FORMAT " from a %s\n", - bytes_read, - serial, --- -1.8.3.1 - diff --git a/meta-aarch64/recipes-core/glib-2.0/glib-2.0_2.38.0.bbappend b/meta-aarch64/recipes-core/glib-2.0/glib-2.0_2.38.0.bbappend deleted file mode 100644 index 27c52ddc..00000000 --- a/meta-aarch64/recipes-core/glib-2.0/glib-2.0_2.38.0.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI_append = " file://0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch" |