Package: bluez-tools Followup-For: Bug #797356 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu wily ubuntu-patch
Dear Maintainer, This patch provides the right includes so gcc can know the right return type instead of assuming an integer. This fix prevents the implicit pointer conversion warning from happening. bt-device.c was missing an include for gio/gunixinputstream.c and configure.ac had to be updated to include gio-unix-2.0 module. Fix also forwarded upstream at https://github.com/khvzak/bluez-tools/pull/7 *** /tmp/tmplbrF1k/bug_body In Ubuntu, the attached patch was applied to achieve the following: - fix FTBFS * Non-maintainer upload. * debian/patches/fix-implicity-pointer-conversion.patch: include gio-unix-2.0 module to configure.ac and gio/gunixinputstream.h to bt-device.c (LP: #1490204, Closes: 797356) Thanks for considering the patch. -- System Information: Debian Release: jessie/sid APT prefers vivid-updates APT policy: (500, 'vivid-updates'), (500, 'vivid-security'), (500, 'vivid'), (100, 'vivid-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.19.0-26-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
diff -Nru bluez-tools-0.2.0~20140808/debian/changelog bluez-tools-0.2.0~20140808/debian/changelog diff -Nru bluez-tools-0.2.0~20140808/debian/patches/fix-implicity-pointer-conversion.patch bluez-tools-0.2.0~20140808/debian/patches/fix-implicity-pointer-conversion.patch --- bluez-tools-0.2.0~20140808/debian/patches/fix-implicity-pointer-conversion.patch 1969-12-31 21:00:00.000000000 -0300 +++ bluez-tools-0.2.0~20140808/debian/patches/fix-implicity-pointer-conversion.patch 2015-08-29 19:55:06.000000000 -0300 @@ -0,0 +1,41 @@ +Description: Fix implicit pointer conversion in bt-device.c + Provide the right includes so gcc can know the right return type + instead of assuming an integer. This fix prevents the implicit + pointer conversion warning from happening (see [1] why it is + good to avoid those kind of conversions). + + bt-device.c was missing an include for gio/gunixinputstream.c. + configure.ac had to be updated to include gio-unix-2.0 module. + + [1] https://wiki.debian.org/ImplicitPointerConversions +Author: Tiago Stürmer Daitx <tiago.da...@canonical.com> +Bug: https://github.com/khvzak/bluez-tools/pull/7 +Bug-Debian: https://bugs.launchpad.net/ubuntu/+source/bluez-tools/+bug/1490204 +Bug-Ubuntu: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=797356 +Forwarded: <URL|no|not-needed, useless if you have a Bug field, optional> +Applied-Upstream: <version|URL|commit, identifies patches merged upstream, optional> +Reviewed-by: <name and email of a reviewer, optional> +Last-Update: <YYYY-MM-DD, last update of the meta-information, optional> +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/configure.ac ++++ b/configure.ac +@@ -39,7 +39,7 @@ + PKG_PROG_PKG_CONFIG + + PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.24.0]) +-PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.26.0]) ++PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.26.0 gio-unix-2.0 >= 2.26.0]) + + # Check for the availability of libreadline + AC_CHECK_HEADERS([readline/readline.h], [HAVE_READLINE_H=1]) +--- a/src/bt-device.c ++++ b/src/bt-device.c +@@ -32,6 +32,7 @@ + + #include <glib.h> + #include <gio/gio.h> ++#include <gio/gunixinputstream.h> + + #include "lib/dbus-common.h" + #include "lib/helpers.h" diff -Nru bluez-tools-0.2.0~20140808/debian/patches/series bluez-tools-0.2.0~20140808/debian/patches/series --- bluez-tools-0.2.0~20140808/debian/patches/series 1969-12-31 21:00:00.000000000 -0300 +++ bluez-tools-0.2.0~20140808/debian/patches/series 2015-08-29 19:55:06.000000000 -0300 @@ -0,0 +1 @@ +fix-implicity-pointer-conversion.patch
