commit: ea97b37dd8393df4c055f829e49eeeb07cbdad77 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> AuthorDate: Tue Mar 19 09:41:39 2019 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Tue Mar 19 09:42:15 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea97b37d
mate-base/mate-applets: fix cpufreq patch Closes: https://bugs.gentoo.org/680870 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 .../files/mate-applets-1.22.0-cpupower.patch | 53 ++++++++++++++++++++++ mate-base/mate-applets/mate-applets-1.22.0.ebuild | 2 +- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch b/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch new file mode 100644 index 00000000000..9c1a80e9375 --- /dev/null +++ b/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch @@ -0,0 +1,53 @@ +diff --git a/configure.ac b/configure.ac +index b49d127..6b87389 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -370,6 +370,8 @@ fi + AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes) + AC_SUBST(LIBCPUFREQ_LIBS) + ++AC_CHECK_HEADERS([cpupower.h]) ++ + build_cpufreq_applet=no + + if test x$disable_cpufreq = xno; then +diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c +index 4fa9d4c..ba52fde 100644 +--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c ++++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c +@@ -19,12 +19,16 @@ + * Authors : Carlos Garc�a Campos <carlo...@gnome.org> + */ + ++#include <config.h> ++ + #include <glib.h> + #include <glib/gi18n.h> + + #include <stdlib.h> +-#include <linux/version.h> + #include <cpufreq.h> ++#ifdef HAVE_CPUPOWER_H ++#include <cpupower.h> ++#endif + #include "cpufreq-monitor-libcpufreq.h" + #include "cpufreq-utils.h" + +@@ -98,7 +102,7 @@ + return CPUFREQ_MONITOR (monitor); + } + +-#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 0) ++#ifndef HAVE_CPUPOWER_H + extern int cpupower_is_cpu_online (unsigned int cpu); + #endif + +@@ -115,7 +119,7 @@ + /* Check whether it failed because + * cpu is not online. + */ +-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) ++#ifndef HAVE_CPUPOWER_H + if (!cpufreq_cpu_exists (cpu)) { + #else + if (cpupower_is_cpu_online (cpu)) { diff --git a/mate-base/mate-applets/mate-applets-1.22.0.ebuild b/mate-base/mate-applets/mate-applets-1.22.0.ebuild index c6c54c6e728..1a1b62dec8c 100644 --- a/mate-base/mate-applets/mate-applets-1.22.0.ebuild +++ b/mate-base/mate-applets/mate-applets-1.22.0.ebuild @@ -52,7 +52,7 @@ DEPEND="${COMMON_DEPEND} sys-devel/gettext:* virtual/pkgconfig:*" -PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" ) +PATCHES=( "${FILESDIR}"/${P}-cpupower.patch ) src_configure() { mate_src_configure \
