summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowi@redhat.com>2016-09-12 18:09:02 -0500
committerYaakov Selkowitz <yselkowi@redhat.com>2016-09-12 18:09:02 -0500
commitc4366cc0bec08ba482ed81b8e76ad026ca496307 (patch)
tree1fbc8fbcf7358d9a5ea6b0b8a528e0abe0ba1c3e
parent195e5031101cefd4c96159e71d3d5a5fb84fc2da (diff)
downloadgnome-applets-f24.tar.gz
gnome-applets-f24.tar.xz
gnome-applets-f24.zip
Update cpupower patch for kernel 4.7f24
-rw-r--r--gnome-applets-cpupower.patch33
-rw-r--r--gnome-applets.spec7
2 files changed, 27 insertions, 13 deletions
diff --git a/gnome-applets-cpupower.patch b/gnome-applets-cpupower.patch
index ec85059..3a51705 100644
--- a/gnome-applets-cpupower.patch
+++ b/gnome-applets-cpupower.patch
@@ -1,12 +1,21 @@
-diff -up gnome-applets-3.1.90/configure.ac.cpupower gnome-applets-3.1.90/configure.ac
---- gnome-applets-3.1.90/configure.ac.cpupower 2011-08-31 18:49:00.628945807 -0400
-+++ gnome-applets-3.1.90/configure.ac 2011-08-31 18:49:17.397946966 -0400
-@@ -518,7 +518,7 @@ AC_CHECK_HEADER(cpufreq.h, have_libcpufr
- LIBCPUFREQ_LIBS=
- if test "x$have_libcpufreq" = "xyes"; then
- AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
-- LIBCPUFREQ_LIBS=-lcpufreq
-+ LIBCPUFREQ_LIBS=-lcpupower
- fi
- AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
- AC_SUBST(LIBCPUFREQ_LIBS)
+https://github.com/mate-desktop/mate-applets/issues/193
+
+--- gnome-applets-3.20.0/cpufreq/src/cpufreq-monitor-libcpufreq.c 2016-03-10 16:53:48.000000000 -0600
++++ gnome-applets-3.20.0/cpufreq/src/cpufreq-monitor-libcpufreq.c 2016-09-12 17:46:30.581654843 -0500
+@@ -23,6 +23,7 @@
+
+ #include <stdlib.h>
+ #include <cpufreq.h>
++#include <cpuidle.h>
+
+ #include "cpufreq-monitor-libcpufreq.h"
+ #include "cpufreq-utils.h"
+@@ -110,7 +111,7 @@
+ /* Check whether it failed because
+ * cpu is not online.
+ */
+- if (!cpufreq_cpu_exists (cpu)) {
++ if (cpupower_is_cpu_online (cpu)) {
+ g_object_set (G_OBJECT (monitor), "online", FALSE, NULL);
+ return TRUE;
+ }
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e91b57c..b477128 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -19,13 +19,14 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 3.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
# VCS: git:git://git.gnome.org/gnome-applets
Source: http://download.gnome.org/sources/%{name}/3.20/%{name}-%{version}.tar.xz
+Patch0: gnome-applets-cpupower.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk3-devel >= %{gtk3_version}
@@ -79,6 +80,7 @@ and more.
%prep
%setup -q
+%patch0 -p1
autoreconf -i -f
@@ -174,6 +176,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Mon Sep 12 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 1:3.20.0-2
+- Update cpupower patch for kernel 4.7
+
* Mon Apr 18 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 1:3.20.0-1
- Version bump for GNOME Flashback 3.20.