[arch-commits] Commit in gnome-applets/trunk (2 files)

[Balló György]

    Date: Monday, October 16, 2017 @ 00:08:57
  Author: bgyorgy
Revision: 263016

upgpkg: gnome-applets 3.26.0-2

Fix cpufreq applet

Added:
  gnome-applets/trunk/0001-fix-build-with-kernel-4.7.patch
Modified:
  gnome-applets/trunk/PKGBUILD

--------------------------------------+
 0001-fix-build-with-kernel-4.7.patch |   36 +++++++++++++++++++++++++++++++++
 PKGBUILD                             |   11 +++++++---
 2 files changed, 44 insertions(+), 3 deletions(-)

Added: 0001-fix-build-with-kernel-4.7.patch
===================================================================
--- 0001-fix-build-with-kernel-4.7.patch	                        (rev 0)
+++ 0001-fix-build-with-kernel-4.7.patch	2017-10-16 00:08:57 UTC (rev 263016)
@@ -0,0 +1,36 @@
+From e6e2837764ae430662220cb0df18089a681a0364 Mon Sep 17 00:00:00 2001
+From: leigh123linux <leigh123linux at googlemail.com>
+Date: Thu, 9 Jun 2016 10:06:34 +0100
+Subject: [PATCH] fix build with kernel-4.7
+
+---
+ cpufreq/src/cpufreq-monitor.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/cpufreq/src/cpufreq-monitor.c b/cpufreq/src/cpufreq-monitor.c
+index 36fbb4e15..e25d0d506 100644
+--- a/cpufreq/src/cpufreq-monitor.c
++++ b/cpufreq/src/cpufreq-monitor.c
+@@ -23,6 +23,7 @@
+ #include "config.h"
+ 
+ #include <cpufreq.h>
++#include <linux/version.h>
+ #include <stdlib.h>
+ 
+ #include "cpufreq-monitor.h"
+@@ -76,7 +77,11 @@ monitor_run (CPUFreqMonitor *monitor)
+   if (!policy)
+     {
+       /* Check whether it failed because cpu is not online. */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
+       if (!cpufreq_cpu_exists (monitor->cpu))
++#else
++      if (cpupower_is_cpu_online (monitor->cpu))
++#endif
+         {
+           monitor->online = FALSE;
+           return TRUE;
+-- 
+2.14.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-15 23:14:43 UTC (rev 263015)
+++ PKGBUILD	2017-10-16 00:08:57 UTC (rev 263016)
@@ -4,7 +4,7 @@
 
 pkgname=gnome-applets
 pkgver=3.26.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Small applications for the GNOME Panel"
 arch=('i686' 'x86_64')
 url="https://wiki.gnome.org/Projects/GnomeApplets"
@@ -11,11 +11,16 @@
 license=('GPL')
 depends=('gnome-panel' 'libgtop' 'libtracker-sparql' 'cpupower' 'upower')
 makedepends=('intltool' 'itstool' 'gnome-settings-daemon')
-source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1a7a9627fa150c3efa512004d08c1eac2be59f2d9c3d6392430179c286c225ce')
+source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        0001-fix-build-with-kernel-4.7.patch)
+sha256sums=('1a7a9627fa150c3efa512004d08c1eac2be59f2d9c3d6392430179c286c225ce'
+            '740ce6bf12d3b4990d670eb04a24ce6bcf7b12f09e6097c4235a95222cdd67e5')
 
 prepare() {
   cd $pkgname-$pkgver
+  # Fix cpufreq applet with recent kernel
+  patch -Np1 -i ../0001-fix-build-with-kernel-4.7.patch
+
   # Build with Tracker 1.0 for now
   sed -i 's/tracker-sparql-2.0/tracker-sparql-1.0/' configure{,.ac}
 }