networkmanager: add patch to build against dbus 1.0

diff --git a/packages/networkmanager/files/dbus-1.0-fix.patch b/packages/networkmanager/files/dbus-1.0-fix.patch
new file mode 100644 (file)
index 0000000..29edc25
--- /dev/null
+++ b/packages/networkmanager/files/dbus-1.0-fix.patch
@@ -0,0 +1,11 @@
+--- /tmp/NetworkManagerDbus.c  2006-11-21 11:07:35.000000000 +0100
++++ NetworkManager-0.6.4/src/NetworkManagerDbus.c      2006-11-21 11:08:35.748554000 +0100
+@@ -833,7 +833,7 @@
+       }
+ 
+       dbus_error_init (&error);
+-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
++#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) || DBUS_VERSION_MAJOR > 0
+       flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;    /* Prohibit replacement is now the default */
+ #else
+       flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;

diff --git a/packages/networkmanager/networkmanager_0.6.4.bb b/packages/networkmanager/networkmanager_0.6.4.bb
index 0496909..e2575ed 100644 (file)
--- a/packages/networkmanager/networkmanager_0.6.4.bb
+++ b/packages/networkmanager/networkmanager_0.6.4.bb
@@ -6,11 +6,12 @@ PRIORITY = "optional"
 DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools libglade"
 RDEPENDS = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \
        file://dbus-api-fix.patch;patch=1 \
-       file://99_networkmanager \
+       file://dbus-1.0-fix.patch;patch=1 \
+        file://99_networkmanager \
        file://NetworkManager \
        file://nm-applet.desktop"