diff options
author | Stephen Klimaszewski <steev@gentoo.org> | 2006-12-06 15:51:25 +0000 |
---|---|---|
committer | Stephen Klimaszewski <steev@gentoo.org> | 2006-12-06 15:51:25 +0000 |
commit | d76ea51b07aae076f8c2d13c6a479c48be9b861c (patch) | |
tree | 61eec9dc90b598a0b252570f68fbe176b7602b62 /net-misc/networkmanager/files | |
parent | Stable on Alpha. (diff) | |
download | gentoo-2-d76ea51b07aae076f8c2d13c6a479c48be9b861c.tar.gz gentoo-2-d76ea51b07aae076f8c2d13c6a479c48be9b861c.tar.bz2 gentoo-2-d76ea51b07aae076f8c2d13c6a479c48be9b861c.zip |
Add patch to fix compilation with D-Bus 1.x, Fixes bug #155279, Thanks to Priit Laes for reporting.
(Portage version: 2.1.1-r2)
Diffstat (limited to 'net-misc/networkmanager/files')
-rw-r--r-- | net-misc/networkmanager/files/networkmanager-0.6.4-dbus-1.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/net-misc/networkmanager/files/networkmanager-0.6.4-dbus-1.patch b/net-misc/networkmanager/files/networkmanager-0.6.4-dbus-1.patch new file mode 100644 index 000000000000..e4e57530f5a3 --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-0.6.4-dbus-1.patch @@ -0,0 +1,16 @@ +--- src/NetworkManagerDbus.c.orig 2006-11-15 23:43:00.000000000 +0200 ++++ src/NetworkManagerDbus.c 2006-11-15 23:44:35.000000000 +0200 +@@ -831,10 +831,10 @@ + } + + dbus_error_init (&error); +-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) +- flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */ +-#else ++#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60) + flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT; ++#else ++ flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */ + #endif + ret = dbus_bus_request_name (connection, NM_DBUS_SERVICE, flags, &error); + if (dbus_error_is_set (&error)) |