mate-base/mate-applets: revert upstream patch, require <cpupower-4.7 #593470

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 (file)
index 0000000..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 <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
+

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 9cf3b3073ebe3d574f342b41ecfaf386396487d4..63f8833be3036b05e1c6a75b8193afc143a2f1c8 100644 (file)
--- 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
+       <sys-power/cpupower-4.7
        x11-libs/gdk-pixbuf:2
        >=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 \