From patchwork Tue Oct 15 11:51:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 21035 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D213920D9F for ; Tue, 15 Oct 2013 12:00:06 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id j10sf7657812oah.9 for ; Tue, 15 Oct 2013 05:00:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=rt9j4zgvzzMWA719Ns3EM0suzUZ1y6YkxAEZP+nuYGU=; b=KqRm+vHHhuZN08qI4K4+ZFnq3pDpy6yQS2OwZiIFBwQnzN56dYBNCFNjl635eRnN49 DEGuyrXADI9rjTF87IBQhTjO9+gHYWn79UldtkiGmkCnOl35KCDNTE9juCNfvHb++Gjw haRHK0EaCXCzOiK8qgABxfkqiGot7CzegGVwsdGr+6+9MaxpHrNQyKHxjB90/spwpcno Ycxh+mDlwH91V4uId+aB6wbXmpc+Irkb3thqrs6WE9Z6RXlH5TQs8S4pivpef5jtUHUF A+29Rx1DE0+9OQwsV+pCEGI9WVLQv9XNElThzmYkDc2xl+NC8WsPs1WuL2GHhFzarV3f VL6A== X-Received: by 10.50.66.232 with SMTP id i8mr8967582igt.3.1381838405917; Tue, 15 Oct 2013 05:00:05 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.129.166 with SMTP id nx6ls83822qeb.12.gmail; Tue, 15 Oct 2013 05:00:05 -0700 (PDT) X-Received: by 10.221.44.136 with SMTP id ug8mr39548667vcb.13.1381838405681; Tue, 15 Oct 2013 05:00:05 -0700 (PDT) Received: from mail-vb0-f41.google.com (mail-vb0-f41.google.com [209.85.212.41]) by mx.google.com with ESMTPS id h7si3194946vee.109.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 05:00:05 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.41 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.41; Received: by mail-vb0-f41.google.com with SMTP id g17so5231417vbg.0 for ; Tue, 15 Oct 2013 05:00:05 -0700 (PDT) X-Gm-Message-State: ALoCoQnQum2luG9onhrEtgvnd/xvxGCfjr1t+gqfn6B/rpB2W9GymYzsCpCehmAH3aYSJjUEmqAh X-Received: by 10.52.22.110 with SMTP id c14mr396493vdf.28.1381837907830; Tue, 15 Oct 2013 04:51:47 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp293222vcz; Tue, 15 Oct 2013 04:51:47 -0700 (PDT) X-Received: by 10.194.71.72 with SMTP id s8mr1632310wju.52.1381837906619; Tue, 15 Oct 2013 04:51:46 -0700 (PDT) Received: from afflict.kos.to (afflict.kos.to. [92.243.29.197]) by mx.google.com with ESMTPS id q8si900116wij.48.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 15 Oct 2013 04:51:46 -0700 (PDT) Received-SPF: neutral (google.com: 92.243.29.197 is neither permitted nor denied by best guess record for domain of riku.voipio@linaro.org) client-ip=92.243.29.197; Received: from localhost.localdomain (91-157-208-114.elisa-laajakaista.fi [91.157.208.114]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id 441BA26551; Tue, 15 Oct 2013 13:51:44 +0200 (CEST) From: Riku Voipio To: openembedded-core@lists.openembedded.org Cc: patches@linaro.org, Riku Voipio Subject: [PATCH] glib-2.0: fix build on Aarch64 Date: Tue, 15 Oct 2013 14:51:05 +0300 Message-Id: <1381837865-24381-1-git-send-email-riku.voipio@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.41 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Backported patch from upstream Signed-off-by: Riku Voipio --- ...ror-format-string-errors-from-mismatched-.patch | 56 ++++++++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb | 1 + 2 files changed, 57 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch 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 0000000..9b87d9d --- /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 @@ +From 0167c3340d8201dca8e9031b61703bbc5ed6ce33 Mon Sep 17 00:00:00 2001 +From: Jan Schmidt +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/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 4b9b112..5717bd2 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 \ file://add-march-i486-into-CFLAGS-automatically.patch \ file://glib-2.0-configure-readlink.patch \ file://run-ptest \ + file://0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch \ " SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"