gentoo resync : 07.10.2018

3 files changed, 0 insertions, 127 deletions

diff --git a/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
deleted file mode 100644
index 070b41754ed0..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index c867af3..4ff5311 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -416,6 +416,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 40c44ba..120693c 100644
---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -19,11 +19,16 @@
-  * Authors : Carlos García Campos <carlosgc@gnome.org>
-  */
- 
-+#include <config.h>
-+
- #include <glib.h>
- #include <glib/gi18n.h>
- 
- #include <stdlib.h>
- #include <cpufreq.h>
-+#ifdef HAVE_CPUPOWER_H
-+#include <cpupower.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.
- 		 */
-+#ifndef HAVE_CPUPOWER_H
- 		if (!cpufreq_cpu_exists (cpu)) {
-+#else
-+    if (cpupower_is_cpu_online (cpu)) {
-+#endif
- 			g_object_set (G_OBJECT (monitor), "online", FALSE, NULL);
- 			return TRUE;
- 		}
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
deleted file mode 100644
index 203f1589a1b2..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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)) {
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
deleted file mode 100644
index 85c2b24bc81b..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e82b68edbfa8d6e209b9ad7b3e6392a928da776e Mon Sep 17 00:00:00 2001
-From: mudler <mudler@sabayon.org>
-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 <glib/gi18n.h>
- 
- #include <stdlib.h>
--#include <linux/version.h>
-+
- #include <cpufreq.h>
- #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
-