dtardon pushed to bluez (master). "fix header file"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun Mar 29 16:40:15 UTC 2015


>From 4d3bfbe1d087f1086205676b5981d699564d49ae Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Sun, 29 Mar 2015 18:31:30 +0200
Subject: fix header file


diff --git a/0001-fix-invalid-conversion.patch b/0001-fix-invalid-conversion.patch
new file mode 100644
index 0000000..e43338d
--- /dev/null
+++ b/0001-fix-invalid-conversion.patch
@@ -0,0 +1,29 @@
+From 11e92de1808451e2811a38ca8e398457574b2f84 Mon Sep 17 00:00:00 2001
+From: Fedora Bluez maintainers <bluez-owner at fedoraproject.org>
+Date: Sun, 29 Mar 2015 18:28:48 +0200
+Subject: [PATCH] fix invalid conversion
+
+error: invalid conversion from 'const void*' to 'const uint8_t* {aka
+const unsigned char*}' [-fpermissive]
+---
+ lib/bluetooth.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/bluetooth.h b/lib/bluetooth.h
+index 6ca64b6..852a6b2 100644
+--- a/lib/bluetooth.h
++++ b/lib/bluetooth.h
+@@ -345,8 +345,8 @@ typedef struct {
+ 
+ static inline void bswap_128(const void *src, void *dst)
+ {
+-	const uint8_t *s = src;
+-	uint8_t *d = dst;
++	const uint8_t *s = (const uint8_t *) src;
++	uint8_t *d = (uint8_t *) dst;
+ 	int i;
+ 
+ 	for (i = 0; i < 16; i++)
+-- 
+2.3.4
+
diff --git a/bluez.spec b/bluez.spec
index 6423324..f7cf4e0 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -3,7 +3,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 5.29
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.bluez.org/
@@ -18,6 +18,7 @@ Patch3: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
 Patch4: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
 Patch5: 0002-autopair-Don-t-handle-the-iCade.patch
 Patch7: 0004-agent-Assert-possible-infinite-loop.patch
+Patch8: 0001-fix-invalid-conversion.patch
 
 BuildRequires: git
 BuildRequires: dbus-devel >= 0.90
@@ -240,6 +241,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/bluetooth/
 /lib/udev/rules.d/97-hid2hci.rules
 
 %changelog
+* Sun Mar 29 2015 David Tardon <dtardon at redhat.com> - 5.29-2
+- fix header file
+
 * Wed Mar 25 2015 Don Zickus <dzickus at redhat.com> 5.29-1
 - Update to 5.29
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/bluez.git/commit/?h=master&id=4d3bfbe1d087f1086205676b5981d699564d49ae


More information about the scm-commits mailing list