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 | |
| 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)
| -rw-r--r-- | net-misc/networkmanager/ChangeLog | 8 | ||||
| -rw-r--r-- | net-misc/networkmanager/files/networkmanager-0.6.4-dbus-1.patch | 16 | ||||
| -rw-r--r-- | net-misc/networkmanager/networkmanager-0.6.4_pre20061028-r1.ebuild | 3 |
3 files changed, 25 insertions, 2 deletions
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog index 678d95098bc4..596a0b53a8f3 100644 --- a/net-misc/networkmanager/ChangeLog +++ b/net-misc/networkmanager/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/networkmanager # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.5 2006/12/04 11:24:56 metalgod Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.6 2006/12/06 15:51:25 steev Exp $ + + 06 Dec 2006; Steev Klimaszewski <steev@gentoo.org> + +files/networkmanager-0.6.4-dbus-1.patch, + networkmanager-0.6.4_pre20061028-r1.ebuild: + Add patch from the NetworkManager mailing list to fix compilation against + D-Bus 1.x. Fixes bug #155279. Thanks to Priit Laes for reporting. 04 Dec 2006; Luis Medinas <metalgod@gentoo.org> networkmanager-0.6.4_pre20061028.ebuild, 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)) diff --git a/net-misc/networkmanager/networkmanager-0.6.4_pre20061028-r1.ebuild b/net-misc/networkmanager/networkmanager-0.6.4_pre20061028-r1.ebuild index a8f24a79dd7d..2ab249ea8757 100644 --- a/net-misc/networkmanager/networkmanager-0.6.4_pre20061028-r1.ebuild +++ b/net-misc/networkmanager/networkmanager-0.6.4_pre20061028-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.4_pre20061028-r1.ebuild,v 1.2 2006/12/04 11:24:56 metalgod Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.4_pre20061028-r1.ebuild,v 1.3 2006/12/06 15:51:25 steev Exp $ inherit gnome2 debug eutils @@ -57,6 +57,7 @@ src_unpack () { epatch ${FILESDIR}/networkmanager-resolvconf-perms.patch epatch ${FILESDIR}/networkmanager-0.6.4-gentooinitscript.patch epatch ${FILESDIR}/networkmanager-0.6.4-confchanges.patch + epatch ${FILESDIR}/networkmanager-0.6.4-dbus-1.patch } src_install() { |