Patchwork [meta-gnome,V2] gnome-bluetooth: Fix build erorrs found with gcc 4.8

login
register
mail settings
Submitter Khem Raj
Date May 15, 2013, 3:45 p.m.
Message ID <1368632717-20991-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/49955/
State Accepted, archived
Commit 9c657f0e6975a283fcc8f3b748c006882fab961a
Headers show

Comments

Khem Raj - May 15, 2013, 3:45 p.m.
Fix errors like below

| bluetooth-input.c:193:4: error: format '%d' expects argument of type
'int', but argument 5 has type 'XID' [-Werror=format=]
|     g_message ("has mouse: %s (id = %d)", device_info[i].name,
device_info[i].id);
|     ^
| bluetooth-input.c:198:4: error: format '%d' expects argument of type
'int', but argument 5 has type 'XID' [-Werror=format=]
|     g_message ("has keyboard: %s (id = %d)", device_info[i].name,
device_info[i].id);
|     ^

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../0001-bluetooth-input-Fix-compile-errors.patch  |   37 ++++++++++++++++++++
 .../gnome-bluetooth/gnome-bluetooth_2.32.0.bb      |    2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch

Patch

diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch
new file mode 100644
index 0000000..0b0cf8b
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch
@@ -0,0 +1,37 @@ 
+From e3c789d6dca9a8a99b60b86e28d8119c55253c13 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 15 May 2013 08:37:03 -0700
+Subject: [PATCH] bluetooth-input: Fix compile errors
+
+XID is unsigned long type so %d will error out with -Wformat
+where format warnings are being treated at errors
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Unknown
+---
+ wizard/bluetooth-input.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/wizard/bluetooth-input.c b/wizard/bluetooth-input.c
+index b3fbdaf..d17e67c 100644
+--- a/wizard/bluetooth-input.c
++++ b/wizard/bluetooth-input.c
+@@ -190,12 +190,12 @@ bluetooth_input_check_for_devices (BluetoothInput *input)
+ 		if (bluetooth_input_device_get_type (&device_info[i], &is_mouse, &is_keyboard) == FALSE)
+ 			continue;
+ 		if (is_mouse != FALSE) {
+-			g_message ("has mouse: %s (id = %d)", device_info[i].name, device_info[i].id);
++			g_message ("has mouse: %s (id = %lu)", device_info[i].name, device_info[i].id);
+ 			has_mouse = TRUE;
+ 			//break;
+ 		}
+ 		if (is_keyboard != FALSE) {
+-			g_message ("has keyboard: %s (id = %d)", device_info[i].name, device_info[i].id);
++			g_message ("has keyboard: %s (id = %lu)", device_info[i].name, device_info[i].id);
+ 			has_keyboard = TRUE;
+ 			//break;
+ 		}
+-- 
+1.7.9.5
+
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
index a2037cf..00ac3f8 100644
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
@@ -11,6 +11,8 @@  DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib lib
 
 inherit gnome
 
+SRC_URI += "file://0001-bluetooth-input-Fix-compile-errors.patch \
+           "
 SRC_URI[archive.md5sum] = "f129686fe46c4c98eb70a0cc85d59cae"
 SRC_URI[archive.sha256sum] = "57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973"