diff options
| -rw-r--r-- | net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch | 30 | ||||
| -rw-r--r-- | net-misc/networkmanager/networkmanager-1.2.2.ebuild | 3 |
2 files changed, 33 insertions, 0 deletions
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 000000000000..52a21c44738e --- /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.olbrich@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 c3669877ad6f..aec828046c0a 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 } |