[arch-commits] Commit in gnome-weather/trunk (PKGBUILD hack-detached.diff)

[Jan Steffens]

    Date: Sunday, March 17, 2019 @ 02:00:05
  Author: heftig
Revision: 348536

3.32.0-2

Added:
  gnome-weather/trunk/hack-detached.diff
Modified:
  gnome-weather/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   15 ++++++++++++---
 hack-detached.diff |   17 +++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-16 23:24:36 UTC (rev 348535)
+++ PKGBUILD	2019-03-17 02:00:05 UTC (rev 348536)
@@ -2,7 +2,7 @@
 
 pkgname=gnome-weather
 pkgver=3.32.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Access current weather conditions and forecasts"
 url="https://wiki.gnome.org/Apps/Weather"
 arch=(any)
@@ -11,8 +11,10 @@
 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")
-sha256sums=('SKIP')
+source=("git+https://gitlab.gnome.org/GNOME/gnome-weather.git#commit=$_commit"
+        hack-detached.diff)
+sha256sums=('SKIP'
+            '47bc9707d7e768aed06ce7feafd038c4d95a8c84fee58ec3bc38a35425eb27be')
 
 pkgver() {
   cd $pkgname
@@ -19,6 +21,13 @@
   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

Added: hack-detached.diff
===================================================================
--- hack-detached.diff	                        (rev 0)
+++ hack-detached.diff	2019-03-17 02:00:05 UTC (rev 348536)
@@ -0,0 +1,17 @@
+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);
+     }
+