[arch-commits] Commit in gnome-weather/repos/extra-any (3 files)

[Jan Steffens]

    Date: Friday, April 5, 2019 @ 19:25:12
  Author: heftig
Revision: 350151

archrelease: copy trunk to extra-any

Added:
  gnome-weather/repos/extra-any/PKGBUILD
    (from rev 350149, gnome-weather/trunk/PKGBUILD)
Deleted:
  gnome-weather/repos/extra-any/PKGBUILD
  gnome-weather/repos/extra-any/hack-detached.diff

--------------------+
 PKGBUILD           |   71 +++++++++++++++++++++++----------------------------
 hack-detached.diff |   17 ------------
 2 files changed, 33 insertions(+), 55 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-05 19:25:11 UTC (rev 350150)
+++ PKGBUILD	2019-04-05 19:25:12 UTC (rev 350151)
@@ -1,38 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-weather
-pkgver=3.32.0
-pkgrel=2
-pkgdesc="Access current weather conditions and forecasts"
-url="https://wiki.gnome.org/Apps/Weather"
-arch=(any)
-license=(GPL)
-depends=(gtk3 gjs libgweather geoclue2 gnome-desktop)
-makedepends=(gobject-introspection appstream-glib git meson)
-groups=(gnome)
-_commit=0ca6ff30ad42246ac62f42d86d978f029266f724  # tags/3.32.0^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-weather.git#commit=$_commit"
-        hack-detached.diff)
-sha256sums=('SKIP'
-            '47bc9707d7e768aed06ce7feafd038c4d95a8c84fee58ec3bc38a35425eb27be')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  # Hack around broken detached locations
-  patch -Np1 -i ../hack-detached.diff
-}
-
-build() {
-  arch-meson $pkgname build
-  ninja -C build
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-}

Copied: gnome-weather/repos/extra-any/PKGBUILD (from rev 350149, gnome-weather/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-04-05 19:25:12 UTC (rev 350151)
@@ -0,0 +1,33 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-weather
+pkgver=3.32.1
+pkgrel=1
+pkgdesc="Access current weather conditions and forecasts"
+url="https://wiki.gnome.org/Apps/Weather"
+arch=(any)
+license=(GPL)
+depends=(gtk3 gjs libgweather geoclue2 gnome-desktop)
+makedepends=(gobject-introspection appstream-glib git meson)
+groups=(gnome)
+_commit=9a35adeea3b8a9a734ca873c95f1222b23772959  # tags/3.32.1^0
+source=("git+https://gitlab.gnome.org/GNOME/gnome-weather.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+}
+
+build() {
+  arch-meson $pkgname build
+  ninja -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+}

Deleted: hack-detached.diff
===================================================================
--- hack-detached.diff	2019-04-05 19:25:11 UTC (rev 350150)
+++ hack-detached.diff	2019-04-05 19:25:12 UTC (rev 350151)
@@ -1,17 +0,0 @@
-diff --git i/src/app/currentLocationController.js w/src/app/currentLocationController.js
-index 67538d2..4cad182 100644
---- i/src/app/currentLocationController.js
-+++ w/src/app/currentLocationController.js
-@@ -87,10 +87,8 @@ var CurrentLocationController = class CurrentLocationController {
-     _onLocationUpdated(simple) {
-         let geoclueLocation = simple.get_location();
- 
--        this.currentLocation = GWeather.Location.new_detached(geoclueLocation.description,
--                                                              null,
--                                                              geoclueLocation.latitude,
--                                                              geoclueLocation.longitude);
-+        this.currentLocation = this._world._world.find_nearest_city(geoclueLocation.latitude,
-+                                                                    geoclueLocation.longitude);
-         this._world.currentLocationChanged(this.currentLocation);
-     }
-