diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-11-21 10:12:30 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2006-11-21 10:12:30 +0000 |
| commit | bad614892f07233e4b89042177862cae503dda10 (patch) | |
| tree | bc2d195dd52f5fdf21b682381f2ca5094b0b1ed1 | |
| parent | cf1d33d740aec5916e1bac4f892de51610f987d1 (diff) | |
networkmanager: add patch to build against dbus 1.0
| -rw-r--r-- | packages/networkmanager/files/dbus-1.0-fix.patch | 11 | ||||
| -rw-r--r-- | packages/networkmanager/networkmanager_0.6.4.bb | 5 |
2 files changed, 14 insertions, 2 deletions
diff --git a/packages/networkmanager/files/dbus-1.0-fix.patch b/packages/networkmanager/files/dbus-1.0-fix.patch new file mode 100644 index 0000000000..29edc255f0 --- /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 0496909e65..e2575ed466 100644 --- 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" |