networkmanager: fix depends and add patch for new dbus api

diff --git a/packages/networkmanager/files/dbus-api-fix.patch b/packages/networkmanager/files/dbus-api-fix.patch
new file mode 100644 (file)
index 0000000..64e60f9
--- /dev/null
+++ b/packages/networkmanager/files/dbus-api-fix.patch
@@ -0,0 +1,20 @@
+--- /tmp/libnm_glib.c  2006-08-24 22:21:01.000000000 +0200
++++ NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c 2006-08-24 22:21:47.888306000 +0200
+@@ -230,7 +230,7 @@
+       {
+               /* Try to reactivate our connection to dbus on the next pass through the event loop */
+               ctx->nm_state = LIBNM_NO_DBUS;
+-              dbus_connection_disconnect (ctx->dbus_con);
++              dbus_connection_close (ctx->dbus_con);
+               libnm_glib_schedule_dbus_watcher (ctx);
+       }
+       else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
+@@ -444,7 +444,7 @@
+               g_main_loop_unref (ctx->g_main_loop);
+ 
+       if (ctx->dbus_con)
+-              dbus_connection_disconnect (ctx->dbus_con);
++              dbus_connection_close (ctx->dbus_con);
+ 
+       if (ctx->callbacks_lock)
+               g_mutex_free (ctx->callbacks_lock);

diff --git a/packages/networkmanager/networkmanager_0.6.4.bb b/packages/networkmanager/networkmanager_0.6.4.bb
index ba6af44..d30a101 100644 (file)
--- a/packages/networkmanager/networkmanager_0.6.4.bb
+++ b/packages/networkmanager/networkmanager_0.6.4.bb
@@ -4,10 +4,13 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.gnome.org"
 MAINTAINER = "Milan Plzik <mmp@handhelds.org>"
 PRIORITY = "optional"
-DEPENDS = "libnl libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools"
+DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools"
 RDEPENDS = "wpa-supplicant dhcdbd gnome-keyring hicolor-icon-theme"
 
+PR = "r1"
+
 SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \
+       file://dbus-api-fix.patch;patch=1 \
        file://99_networkmanager \
        file://NetworkManager \
        file://nm-applet.desktop"