diff options
| -rw-r--r-- | packages/dhcdbd/dhcdbd_1.14.bb | 10 | ||||
| -rw-r--r-- | packages/dhcdbd/files/dbus-api-fix.patch | 20 | ||||
| -rw-r--r-- | packages/networkmanager/files/dbus-api-fix.patch | 20 | ||||
| -rw-r--r-- | packages/networkmanager/networkmanager_0.6.4.bb | 5 |
4 files changed, 49 insertions, 6 deletions
diff --git a/packages/dhcdbd/dhcdbd_1.14.bb b/packages/dhcdbd/dhcdbd_1.14.bb index f46543d2d4..3194942e4e 100644 --- a/packages/dhcdbd/dhcdbd_1.14.bb +++ b/packages/dhcdbd/dhcdbd_1.14.bb @@ -6,13 +6,13 @@ MAINTAINER="Milan Plzik <mmp@handhelds.org>" DEPENDS = "dbus" +PR = "r1" + SRC_URI="http://people.redhat.com/jvdias/dhcdbd/dhcdbd-${PV}.tar.gz \ - file://dhcdbd-1.14-pkgconfig_dbus.patch;patch=1\ + file://dhcdbd-1.14-pkgconfig_dbus.patch;patch=1 \ + file://dbus-api-fix.patch;patch=1 \ file://dhcdbd" -do_configure() { -} - do_compile() { CC=${TARGET_SYS}-gcc DESTDIR=${prefix} make } @@ -23,4 +23,4 @@ do_install() { install -m 0755 ${WORKDIR}/dhcdbd ${D}/etc/init.d/ } -FILES_${PN}="${sysconfdir} ${datadir}/dbus-1 ${base_sbindir}" +FILES_${PN} += "${sysconfdir} ${datadir}/dbus-1 ${base_sbindir}/*" diff --git a/packages/dhcdbd/files/dbus-api-fix.patch b/packages/dhcdbd/files/dbus-api-fix.patch new file mode 100644 index 0000000000..ce05fc7bf8 --- /dev/null +++ b/packages/dhcdbd/files/dbus-api-fix.patch @@ -0,0 +1,20 @@ +--- /tmp/dbus_service.c 2006-08-24 22:09:14.000000000 +0200 ++++ dhcdbd-1.14/dbus_service.c 2006-08-24 22:09:44.228306000 +0200 +@@ -1412,7 +1412,7 @@ + return ( cs ); + + give_up: +- dbus_connection_disconnect( connection ); ++ dbus_connection_close( connection ); + dbus_shutdown(); + return ( 0L ); + } +@@ -1456,7 +1456,7 @@ + cs->roots=0L; + + +- dbus_connection_disconnect( cs->connection ); ++ dbus_connection_close( cs->connection ); + dbus_shutdown(); + free( cs ); + } diff --git a/packages/networkmanager/files/dbus-api-fix.patch b/packages/networkmanager/files/dbus-api-fix.patch new file mode 100644 index 0000000000..64e60f961b --- /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 ba6af44e16..d30a101bcb 100644 --- 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" |