btscanner 2.0: Make buildable with gcc4.

* Closes #2022.

diff --git a/packages/btscanner/btscanner_2.0.bb b/packages/btscanner/btscanner_2.0.bb
index 1e75824..0478577 100644 (file)
--- a/packages/btscanner/btscanner_2.0.bb
+++ b/packages/btscanner/btscanner_2.0.bb
@@ -3,10 +3,12 @@ SECTION = "libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.pentest.co.uk/cgi-bin/viewcat.cgi?cat=downloads&section=01_bluetooth"
 DEPENDS = "bluez-libs gdbm ncurses libxml2"
-PR = "r0"
+PR = "r1"
 LICENSE = "GPLv2"
 
-SRC_URI = "http://www.pentest.co.uk/src/btscanner-${PV}.tar.bz2"
+SRC_URI = "http://www.pentest.co.uk/src/btscanner-${PV}.tar.bz2 \
+           file://gcc-4.patch;patch=1 \
+           "
 
 #Yes, the packages uses this ugly hardcoded path instead of ${sysconfdir}
 FILES_${PN} += "/usr/share/oui.txt"

diff --git a/packages/btscanner/files/.mtn2git_empty b/packages/btscanner/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/btscanner/files/gcc-4.patch b/packages/btscanner/files/gcc-4.patch
new file mode 100644 (file)
index 0000000..dab2bfa
--- /dev/null
+++ b/packages/btscanner/files/gcc-4.patch
@@ -0,0 +1,12 @@
+diff -Naur btscanner-2.0.orig/configure.in btscanner-2.0/configure.in
+--- btscanner-2.0.orig/configure.in    2004-11-01 12:56:02.000000000 +0100
++++ btscanner-2.0/configure.in 2007-03-11 14:58:09.000000000 +0100
+@@ -64,7 +64,7 @@
+ 
+ # CFLAGS
+ CFLAGS="$CFLAGS -Wall -pthread -Wshadow -Wbad-function-cast \
+-  -Wformat -Wimplicit-function-dec -Wparentheses -Wsign-compare \
++  -Wformat -Wparentheses -Wsign-compare \
+   -Wstrict-prototypes -Wtrigraphs -Wundef -Wuninitialized \
+   -W -Wunused -Wformat-security -Wmissing-braces -Wbad-function-cast \
+   -Wcast-qual -falign-functions -falign-labels -falign-loops\