summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNP-Hardass <NP-Hardass@gentoo.org>2016-09-05 22:13:06 -0400
committerNP-Hardass <NP-Hardass@gentoo.org>2016-09-10 15:35:49 -0400
commitcb0ccf6943077fc6fb43396b76a3cbd7fa11085a (patch)
treed692db6b624de8d4887447a4b55071f13a565290 /mate-base/mate-applets/files
parentmate-base/mate-applets: Drop orphaned patch (diff)
downloadgentoo-cb0ccf6943077fc6fb43396b76a3cbd7fa11085a.tar.gz
gentoo-cb0ccf6943077fc6fb43396b76a3cbd7fa11085a.tar.bz2
gentoo-cb0ccf6943077fc6fb43396b76a3cbd7fa11085a.zip
mate-base/mate-applets: backport kernel 4.7 support
Package-Manager: portage-2.3.0
Diffstat (limited to 'mate-base/mate-applets/files')
-rw-r--r--mate-base/mate-applets/files/mate-applets-1.10.4-kernel-4.7.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/mate-base/mate-applets/files/mate-applets-1.10.4-kernel-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.10.4-kernel-4.7.patch
new file mode 100644
index 000000000000..afe06dcb8807
--- /dev/null
+++ b/mate-base/mate-applets/files/mate-applets-1.10.4-kernel-4.7.patch
@@ -0,0 +1,38 @@
+From 1b4478eab642787c43601259611f7b27e0bb473b Mon Sep 17 00:00:00 2001
+From: leigh123linux <leigh123linux@googlemail.com>
+Date: Thu, 9 Jun 2016 10:06:34 +0100
+Subject: [PATCH] fix build with kernel-4.7
+
+---
+ cpufreq/src/cpufreq-monitor-libcpufreq.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+index 40c44ba..5fe79fb 100644
+--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
++++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+@@ -23,8 +23,11 @@
+ #include <glib/gi18n.h>
+
+ #include <stdlib.h>
++#include <linux/version.h>
+ #include <cpufreq.h>
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++#include <cpuidle.h>
++#endif
+ #include "cpufreq-monitor-libcpufreq.h"
+ #include "cpufreq-utils.h"
+
+@@ -111,7 +114,11 @@ 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;
+ }