nonprism/gnome-weather: updated to 3.26.0

2 files changed, 41 insertions, 35 deletions

diff --git a/nonprism/gnome-weather/PKGBUILD b/nonprism/gnome-weather/PKGBUILD
index 3bfadf07b..92ce19f92 100644
--- a/nonprism/gnome-weather/PKGBUILD
+++ b/nonprism/gnome-weather/PKGBUILD
@@ -1,41 +1,49 @@
-# $Id: PKGBUILD 287540 2017-01-26 20:52:06Z heftig $
+# Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Contributor: André Silva <emulatorman@hyperbola.info>
 
 pkgname=gnome-weather
-pkgver=3.20.2
-pkgrel=2.nonprism1
+
+pkgver=3.26.0
+pkgrel=1.nonprism1
+arch=(any)
+
 pkgdesc="Access current weather conditions and forecasts, without geoclue2 support"
 url="https://wiki.gnome.org/Apps/Weather"
-arch=(any)
 license=(GPL)
-depends=(gtk3 gjs libgweather gnome-desktop)
+
 makedepends=(intltool gobject-introspection autoconf-archive appstream-glib git)
+depends=(gtk3 gjs libgweather gnome-desktop)
 groups=(gnome-extra)
-_commit=dc0de147404ca887471990c54f6cd94afe27dcd2  # tags/3.20.2^0
+
+_commit=608877f993ab001666d9ca843c23c98c16459abe  # tags/3.26.0^0
 source=("git+https://git.gnome.org/browse/gnome-weather#commit=$_commit"
-        nonprism.patch)
+        "nonprism.patch")
 sha256sums=('SKIP'
-            '310d0d1b61e4d791abe6670418ae53d10595f0e7a772d3e73ab59a454385d8be')
+            '982ac0d22e5e46adc97d5b9b964a13c3c036f9525b42b05fc56946a1d114f0de')
 
 pkgver() {
   cd $pkgname
+
   git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
   cd $pkgname
+
   patch -p1 -i $srcdir/nonprism.patch
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
   cd $pkgname
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }
 
 package() {
   cd $pkgname
+
   make DESTDIR="$pkgdir" install
 }
diff --git a/nonprism/gnome-weather/nonprism.patch b/nonprism/gnome-weather/nonprism.patch
index 3b4c4cfac..df6da2e9e 100644
--- a/nonprism/gnome-weather/nonprism.patch
+++ b/nonprism/gnome-weather/nonprism.patch
@@ -23,7 +23,7 @@ diff --git a/src/app/currentLocationController.js b/src/app/currentLocationContr
 index c070598b3..10b436d54 100644
 --- a/src/app/currentLocationController.js
 +++ b/src/app/currentLocationController.js
-@@ -20,16 +20,9 @@ const GLib = imports.gi.GLib;
+@@ -20,104 +20,14 @@ const GLib = imports.gi.GLib;
  const Gio = imports.gi.Gio;
  const Lang = imports.lang;
  const GWeather = imports.gi.GWeather;
@@ -31,16 +31,14 @@ index c070598b3..10b436d54 100644
  
  const Util = imports.misc.util;
  
--const AutoLocation = {
+-var AutoLocation = {
 -    DISABLED: 0,
 -    ENABLED: 1,
 -    NOT_AVAILABLE: 2
 -};
 -
- const CurrentLocationController = new Lang.Class({
-     Name: 'CurrentLocationController',
- 
-@@ -37,89 +30,6 @@ const CurrentLocationController = new Lang.Class({
+ var CurrentLocationController = class CurrentLocationController {
+     constructor(world) {
          this._world = world;
          this._processStarted = false;
          this._settings = Util.getSettings('org.gnome.Weather.Application');
@@ -49,25 +47,25 @@ index c070598b3..10b436d54 100644
 -        if (this.autoLocation == AutoLocation.ENABLED)
 -            this._startGeolocationService();
          this.currentLocation = null;
-     },
+     }
 -
--    _startGeolocationService: function() {
+-    _startGeolocationService() {
 -        this._processStarted = true;
 -        Geoclue.Simple.new(pkg.name,
 -                           Geoclue.AccuracyLevel.CITY,
 -                           null,
--                           Lang.bind (this, this._onSimpleReady));
--    },
+-                           this._onSimpleReady.bind(this));
+-    }
 -
--    _geoLocationFailed: function(e) {
+-    _geoLocationFailed(e) {
 -        log ("Failed to connect to GeoClue2 service: " + e.message);
 -        this.autoLocation = AutoLocation.NOT_AVAILABLE;
--        GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
+-        GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
 -            this._world.currentLocationChanged(null);
--        }));
--    },
+-        });
+-    }
 -
--    _onSimpleReady: function(object, result) {
+-    _onSimpleReady(object, result) {
 -        try {
 -            this._simple = Geoclue.Simple.new_finish(result);
 -        }
@@ -80,17 +78,17 @@ index c070598b3..10b436d54 100644
 -        client.distance_threshold = 100;
 -
 -        this._findLocation();
--    },
+-    }
 -
--    _findLocation: function() {
+-    _findLocation() {
 -        this._locationUpdatedId =
 -                    this._simple.connect("notify::location",
 -                                         this._onLocationUpdated.bind(this));
 -
 -        this._onLocationUpdated(this._simple);
--    },
+-    }
 -
--    _onLocationUpdated: function(simple) {
+-    _onLocationUpdated(simple) {
 -        let geoclueLocation = simple.get_location();
 -
 -        this.currentLocation = GWeather.Location.new_detached(geoclueLocation.description,
@@ -98,25 +96,25 @@ index c070598b3..10b436d54 100644
 -                                                              geoclueLocation.latitude,
 -                                                              geoclueLocation.longitude);
 -        this._world.currentLocationChanged(this.currentLocation);
--    },
+-    }
 -
--    setAutoLocation: function(active) {
+-    setAutoLocation(active) {
 -        this._settings.set_value('automatic-location', new GLib.Variant('b', active));
 -
 -        if (this.autoLocation == AutoLocation.NOT_AVAILABLE)
 -            return;
 -        this._autoLocationChanged(active);
 -        this._syncAutoLocation(active);
--    },
+-    }
 -
--    _syncAutoLocation: function(autoLocation) {
+-    _syncAutoLocation(autoLocation) {
 -        if (autoLocation)
 -            this.autoLocation = AutoLocation.ENABLED;
 -        else
 -            this.autoLocation = AutoLocation.DISABLED;
--    },
+-    }
 -
--    _autoLocationChanged: function(active) {
+-    _autoLocationChanged(active) {
 -        if (active) {
 -            if (!this._processStarted) {
 -                this._startGeolocationService();
@@ -129,4 +127,4 @@ index c070598b3..10b436d54 100644
 -            this._simple.disconnect(this._locationUpdatedId);
 -        }
 -    }
- });
+ }