commit: 2dc98b75db10d30cc56d89e9b4188cb68b71cd6c Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> AuthorDate: Fri Jul 8 20:41:52 2016 +0000 Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> CommitDate: Fri Jul 8 20:43:22 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dc98b75
net-misc/networkmanager: fix build when USE="consolekit -systemd" (bug #588278) Thanks to jorgicio for finding the patch. Package-Manager: portage-2.3.0 ...anager-1.2.2-sleep-monitor-upower-include.patch | 30 ++++++++++++++++++++++ .../networkmanager/networkmanager-1.2.2.ebuild | 3 +++ 2 files changed, 33 insertions(+) diff --git a/net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch b/net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch new file mode 100644 index 0000000..52a21c4 --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch @@ -0,0 +1,30 @@ +From 10ba492047b1ad80adeeb878e7f155a13638da7f Mon Sep 17 00:00:00 2001 +From: Michael Olbrich <m.olbr...@pengutronix.de> +Date: Wed, 18 May 2016 10:43:51 +0200 +Subject: [PATCH] sleep-monitor-upower: add missing include + +Otherwise building fails with: + + nm-sleep-monitor-upower.c:132:45: error: expected declaration specifiers or '...' before 'nm_sleep_monitor_get' + nm-sleep-monitor-upower.c:132:67: error: expected declaration specifiers or '...' before '(' token + +https://mail.gnome.org/archives/networkmanager-list/2016-May/msg00053.html +--- + src/nm-sleep-monitor-upower.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c +index 5f0ff24..8d07190 100644 +--- a/src/nm-sleep-monitor-upower.c ++++ b/src/nm-sleep-monitor-upower.c +@@ -24,6 +24,7 @@ + #include <sys/stat.h> + + #include "nm-core-internal.h" ++#include "NetworkManagerUtils.h" + + #include "nm-sleep-monitor.h" + +-- +2.9.0 + diff --git a/net-misc/networkmanager/networkmanager-1.2.2.ebuild b/net-misc/networkmanager/networkmanager-1.2.2.ebuild index c366987..aec8280 100644 --- a/net-misc/networkmanager/networkmanager-1.2.2.ebuild +++ b/net-misc/networkmanager/networkmanager-1.2.2.ebuild @@ -117,6 +117,9 @@ src_prepare() { # Don't build examples, they are not needed and can cause build failure sed -e '/^\s*examples\s*\\/d' -i Makefile.{am,in} || die + # Upstream patches from 1.2 branch + eapply "${FILESDIR}/${P}-sleep-monitor-upower-include.patch" #588278 + use vala && vala_src_prepare gnome2_src_prepare }