diff options
author | NP-Hardass <NP-Hardass@gentoo.org> | 2017-09-22 17:26:40 -0400 |
---|---|---|
committer | NP-Hardass <NP-Hardass@gentoo.org> | 2017-09-22 17:26:56 -0400 |
commit | 53fd275242b53169b20f487efd38698e54e9c32c (patch) | |
tree | fac1182f88f179b73e73e9106ebdcc5c11ee6450 /mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch | |
parent | dev-libs/libbytesize: Removed old. (diff) | |
download | gentoo-53fd275242b53169b20f487efd38698e54e9c32c.tar.gz gentoo-53fd275242b53169b20f487efd38698e54e9c32c.tar.bz2 gentoo-53fd275242b53169b20f487efd38698e54e9c32c.zip |
mate-base/mate-applets: Fix compilation with >=cpupower-4.7
Closes: https://bugs.gentoo.org/593470
Package-Manager: Portage-2.3.10, Repoman-2.3.3
Diffstat (limited to 'mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch')
-rw-r--r-- | mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch new file mode 100644 index 000000000000..203f1589a1b2 --- /dev/null +++ b/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch @@ -0,0 +1,44 @@ +diff --git a/configure.ac b/configure.ac +index b49d127..6b87389 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -411,6 +411,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 <carlosgc@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" +@@ -112,7 +116,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)) { |