[oe-commits] org.oe.dev networkmanager: fix depends and add patch for new dbus api

[koen commit]

networkmanager: fix depends and add patch for new dbus api

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: b64396ce3d5654be49c78631e77235e16dd81e86
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b64396ce3d5654be49c78631e77235e16dd81e86
Files:
1
packages/networkmanager/files/dbus-api-fix.patch
packages/networkmanager/networkmanager_0.6.4.bb
Diffs:

#
# mt diff -r4013d0d7e4eb52fd5a82f8e3ac31cedc548a3d60 -rb64396ce3d5654be49c78631e77235e16dd81e86
#
# 
# 
# add_file "packages/networkmanager/files/dbus-api-fix.patch"
#  content [b3d9f1b3e6388f5b79085d78e9f1a56d68a6382c]
# 
# patch "packages/networkmanager/networkmanager_0.6.4.bb"
#  from [ccbbe8f89c9a65382f79ef636b12b78159b9661b]
#    to [faf0bf8fe37fd0637af789b620072f46c9d5a406]
# 
============================================================
--- packages/networkmanager/files/dbus-api-fix.patch	b3d9f1b3e6388f5b79085d78e9f1a56d68a6382c
+++ packages/networkmanager/files/dbus-api-fix.patch	b3d9f1b3e6388f5b79085d78e9f1a56d68a6382c
@@ -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);
============================================================
--- packages/networkmanager/networkmanager_0.6.4.bb	ccbbe8f89c9a65382f79ef636b12b78159b9661b
+++ packages/networkmanager/networkmanager_0.6.4.bb	faf0bf8fe37fd0637af789b620072f46c9d5a406
@@ -1,13 +1,16 @@ PRIORITY = "optional"
 DESCRIPTION = "GNOME NetworkManager port"
 SECTION = "net/misc"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.gnome.org"
 MAINTAINER = "Milan Plzik <mmp at 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"