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

[Balló György]

    Date: Friday, March 23, 2018 @ 21:31:07
  Author: bgyorgy
Revision: 311662

upgpkg: gnome-applets 3.28.0-1

Update to new version

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

--------------------------------------+
 0001-fix-build-with-kernel-4.7.patch |   36 ---------------------------------
 PKGBUILD                             |   23 +++++----------------
 2 files changed, 6 insertions(+), 53 deletions(-)

Deleted: 0001-fix-build-with-kernel-4.7.patch
===================================================================
--- 0001-fix-build-with-kernel-4.7.patch	2018-03-23 21:27:39 UTC (rev 311661)
+++ 0001-fix-build-with-kernel-4.7.patch	2018-03-23 21:31:07 UTC (rev 311662)
@@ -1,36 +0,0 @@
-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	2018-03-23 21:27:39 UTC (rev 311661)
+++ PKGBUILD	2018-03-23 21:31:07 UTC (rev 311662)
@@ -3,33 +3,22 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-applets
-pkgver=3.26.0
-pkgrel=3
+pkgver=3.28.0
+pkgrel=1
 pkgdesc="Small applications for the GNOME Panel"
 arch=('x86_64')
 url="https://wiki.gnome.org/Projects/GnomeApplets"
 license=('GPL')
 depends=('gnome-panel' 'libgtop' 'tracker' 'cpupower' 'upower')
-makedepends=('intltool' 'itstool' 'gnome-settings-daemon')
-source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        0001-fix-build-with-kernel-4.7.patch)
-sha256sums=('1a7a9627fa150c3efa512004d08c1eac2be59f2d9c3d6392430179c286c225ce'
-            '740ce6bf12d3b4990d670eb04a24ce6bcf7b12f09e6097c4235a95222cdd67e5')
+makedepends=('intltool' 'itstool' 'gnome-settings-daemon' 'python')
+source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('b0f823cc54c55ec02393109386ed33e2ea13edd0218bd14aed2c9fb273bca671')
 
-prepare() {
-  cd $pkgname-$pkgver
-  # Fix cpufreq applet with recent kernel
-  patch -Np1 -i ../0001-fix-build-with-kernel-4.7.patch
-}
-
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-schemas-compile --with-cpufreq-lib=cpupower --disable-maintainer-mode
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+              --disable-schemas-compile --disable-maintainer-mode
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
   make
 }