summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikle Kolyada <zlogene@gentoo.org>2019-03-19 12:41:39 +0300
committerMikle Kolyada <zlogene@gentoo.org>2019-03-19 12:42:15 +0300
commitea97b37dd8393df4c055f829e49eeeb07cbdad77 (patch)
treeaaa7727499118266f822370f983c6010fdbe9f82 /mate-base
parentnet-libs/libpsl: Don't enable ubsan (diff)
downloadgentoo-ea97b37dd8393df4c055f829e49eeeb07cbdad77.tar.gz
gentoo-ea97b37dd8393df4c055f829e49eeeb07cbdad77.tar.bz2
gentoo-ea97b37dd8393df4c055f829e49eeeb07cbdad77.zip
mate-base/mate-applets: fix cpufreq patch
Closes: https://bugs.gentoo.org/680870 Signed-off-by: Mikle Kolyada <zlogene@gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11
Diffstat (limited to 'mate-base')
-rw-r--r--mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch53
-rw-r--r--mate-base/mate-applets/mate-applets-1.22.0.ebuild2
2 files changed, 54 insertions, 1 deletions
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 <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"
+
+@@ -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 \