From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DBF581382F6 for ; Fri, 8 Jul 2016 20:44:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D213E08E1; Fri, 8 Jul 2016 20:44:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7D96E08E1 for ; Fri, 8 Jul 2016 20:44:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E65E3340C3E for ; Fri, 8 Jul 2016 20:44:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CCCAB2098 for ; Fri, 8 Jul 2016 20:44:24 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1468010602.2dc98b75db10d30cc56d89e9b4188cb68b71cd6c.tetromino@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager/, net-misc/networkmanager/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch net-misc/networkmanager/networkmanager-1.2.2.ebuild X-VCS-Directories: net-misc/networkmanager/files/ net-misc/networkmanager/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: 2dc98b75db10d30cc56d89e9b4188cb68b71cd6c X-VCS-Branch: master Date: Fri, 8 Jul 2016 20:44:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2861ba80-2a56-41ca-b3ce-ba7cf557333a X-Archives-Hash: 2e1a516a536f814d60e1daf87f3fda4a commit: 2dc98b75db10d30cc56d89e9b4188cb68b71cd6c Author: Alexandre Rostovtsev gentoo org> AuthorDate: Fri Jul 8 20:41:52 2016 +0000 Commit: Alexandre Rostovtsev gentoo 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 +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 + + #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 }