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 A3AA41395E2 for ; Mon, 21 Nov 2016 11:02:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B419121C08A; Mon, 21 Nov 2016 11:02:19 +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 8E23721C08A for ; Mon, 21 Nov 2016 11:02:09 +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 CD56A34125C for ; Mon, 21 Nov 2016 11:02:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38A5B24AE for ; Mon, 21 Nov 2016 11:02:02 +0000 (UTC) From: "Ettore Di Giacinto" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ettore Di Giacinto" Message-ID: <1479726043.e6d9cc91405bdf581c1f4a2c104e9cf29a154bc4.mudler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/ X-VCS-Repository: repo/gentoo X-VCS-Files: mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild mate-base/mate-applets/mate-applets-1.14.1.ebuild X-VCS-Directories: mate-base/mate-applets/files/ mate-base/mate-applets/ X-VCS-Committer: mudler X-VCS-Committer-Name: Ettore Di Giacinto X-VCS-Revision: e6d9cc91405bdf581c1f4a2c104e9cf29a154bc4 X-VCS-Branch: master Date: Mon, 21 Nov 2016 11:02:02 +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: 1554646f-cd69-44b1-896f-e2724e53a199 X-Archives-Hash: ed1d3d3947e7837ea342fd10ae4758c2 commit: e6d9cc91405bdf581c1f4a2c104e9cf29a154bc4 Author: mudler sabayon org> AuthorDate: Tue Sep 13 21:42:26 2016 +0000 Commit: Ettore Di Giacinto gentoo org> CommitDate: Mon Nov 21 11:00:43 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6d9cc91 mate-base/mate-applets: revert upstream patch, require mate-applets-1.14.1-r1.ebuild} | 5 ++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch b/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch new file mode 100644 index 00000000..85c2b24 --- /dev/null +++ b/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch @@ -0,0 +1,37 @@ +From e82b68edbfa8d6e209b9ad7b3e6392a928da776e Mon Sep 17 00:00:00 2001 +From: mudler +Date: Tue, 13 Sep 2016 23:33:58 +0200 +Subject: [PATCH] fix 1.14.1 on kernel-headers >=4.7 + +--- + cpufreq/src/cpufreq-monitor-libcpufreq.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c +index 228a890..587e316 100644 +--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c ++++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c +@@ -23,7 +23,7 @@ + #include + + #include +-#include ++ + #include + #include "cpufreq-monitor-libcpufreq.h" + #include "cpufreq-utils.h" +@@ -111,11 +111,7 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor) + /* Check whether it failed because + * cpu is not online. + */ +-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) + if (!cpufreq_cpu_exists (cpu)) { +-#else +- if (cpupower_is_cpu_online (cpu)) { +-#endif + g_object_set (G_OBJECT (monitor), "online", FALSE, NULL); + return TRUE; + } +-- +2.9.2 + diff --git a/mate-base/mate-applets/mate-applets-1.14.1.ebuild b/mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild similarity index 95% rename from mate-base/mate-applets/mate-applets-1.14.1.ebuild rename to mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild index 9cf3b30..63f8833 100644 --- a/mate-base/mate-applets/mate-applets-1.14.1.ebuild +++ b/mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild @@ -19,6 +19,7 @@ SLOT="0" IUSE="X gtk3 ipv6 policykit +upower" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +#cpupower #593470 COMMON_DEPEND="${PYTHON_DEPS} dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 @@ -31,7 +32,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=mate-base/mate-panel-1.7[gtk3(-)=] >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 - sys-power/cpupower + =x11-libs/libnotify-0.7:0 x11-libs/libX11:0 @@ -71,6 +72,8 @@ DEPEND="${COMMON_DEPEND} sys-devel/gettext:* virtual/pkgconfig:*" +PATCHES=( "${FILESDIR}/${PN}-1.14.1-revert-upstream-cpupower-4.7-fix.patch" ) + src_configure() { mate_src_configure \ --libexecdir=/usr/libexec/mate-applets \