bluez-utils: update dbus patch courtesy Patrick Steiner

diff --git a/packages/bluez-utils/bluez-utils-common_2.18.inc b/packages/bluez-utils/bluez-utils-common_2.18.inc
index 348636b..82ac9e8 100644 (file)
--- a/packages/bluez-utils/bluez-utils-common_2.18.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.18.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "bluez-libs-${PV} pcmcia-cs"
 RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
        file://base.patch;patch=1 \

diff --git a/packages/bluez-utils/bluez-utils-dbus/dbus.patch b/packages/bluez-utils/bluez-utils-dbus/dbus.patch
index ecab56b..f5d670c 100644 (file)
--- a/packages/bluez-utils/bluez-utils-dbus/dbus.patch
+++ b/packages/bluez-utils/bluez-utils-dbus/dbus.patch
@@ -1,6 +1,6 @@
---- bluez-utils-2.10/acinclude.m4.old  2004-10-19 22:34:47.000000000 +0100
-+++ bluez-utils-2.10/acinclude.m4      2004-10-19 22:50:47.000000000 +0100
-@@ -124,45 +124,14 @@
+--- bluez-utils-2.18/acinclude.m4.old  2005-07-11 12:15:00.000000000 +0200
++++ bluez-utils-2.18/acinclude.m4      2005-07-11 12:18:48.000000000 +0200
+@@ -211,48 +211,17 @@
  ])
  
  AC_DEFUN([AC_PATH_DBUS], [
@@ -23,7 +23,7 @@
 -              test -d "${dbus_prefix}/lib64/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib64/dbus-1.0/include"
 -              test -d "${dbus_prefix}/lib/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib/dbus-1.0/include"
 -      fi
--
+ 
 +      if pkg-config --exists dbus-1; then
 +      dbus_found=yes ; DBUS_CFLAGS="`pkg-config --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
 +      DBUS_LIBS="`pkg-config --libs dbus-1`"
@@ -37,13 +37,16 @@
 -              test -d "${dbus_prefix}/lib64" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib64"
 -              test -d "${dbus_prefix}/lib" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib"
 -      fi
--
+ 
        LDFLAGS="$LDFLAGS $DBUS_LIBS"
 -      AC_CHECK_LIB(dbus-1, dbus_error_init, DBUS_LIBS="$DBUS_LIBS -ldbus-1", dbus_found=no)
+-      AC_CHECK_LIB(dbus-1, dbus_pending_call_steal_reply, AC_DEFINE(HAVE_DBUS_PENDING_CALL_STEAL_REPLY, 1, [Define to 1 if you have the dbus_pending_call_steal_reply() function.]))
+-      AC_CHECK_LIB(dbus-1, dbus_message_iter_get_basic, AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_GET_BASIC, 1, [Define to 1 if you have the dbus_message_iter_get_basic() function.]))
+-      AC_CHECK_LIB(dbus-1, dbus_message_append_args, AC_DEFINE(HAVE_DBUS_MESSAGE_APPEND_ARGS, 1, [Define to 1 if you have the dbus_message_append_args() function.]))
 -
 -      CPPFLAGS=$ac_save_CPPFLAGS
 -      LDFLAGS=$ac_save_LDFLAGS
--
+ 
        AC_SUBST(DBUS_CFLAGS)
        AC_SUBST(DBUS_LIBS)
 +      fi