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

[Jan Steffens]

    Date: Sunday, March 17, 2019 @ 02:43:12
  Author: heftig
Revision: 348538

3.32.0+16+g1341d5557-1

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

--------------------+
 PKGBUILD           |   17 +++++++++++++----
 hack-detached.diff |   17 +++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-17 02:00:18 UTC (rev 348537)
+++ PKGBUILD	2019-03-17 02:43:12 UTC (rev 348538)
@@ -3,7 +3,7 @@
 # Contributor: Flamelab <panosfilip at gmail.com
 
 pkgname=gnome-shell
-pkgver=3.32.0+15+gb7d79a5f0
+pkgver=3.32.0+16+g1341d5557
 pkgrel=1
 epoch=1
 pkgdesc="Next generation desktop shell"
@@ -18,11 +18,13 @@
 optdepends=('gnome-control-center: System settings'
             'evolution-data-server: Evolution calendar integration')
 groups=(gnome)
-_commit=b7d79a5f063341f1773a9a8a5550a188c04efbda  # master
+_commit=1341d5557fbf05691172459e14cde70a8d5e96c3  # master
 source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
+        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
+        hack-detached.diff)
 sha256sums=('SKIP'
-            'SKIP')
+            'SKIP'
+            '939e81f682ebafd60e86d444e49dbab277fba0f00420466b5ff783568b7dc931')
 
 pkgver() {
   cd $pkgname
@@ -31,6 +33,13 @@
 
 prepare() {
   cd $pkgname
+
+  # Unbreak switcher
+  git cherry-pick -n 00a4891fb93a3846c48bc6fc1167205e2afab67b
+
+  # Hack around broken detached locations
+  patch -Np1 -i ../hack-detached.diff
+
   git submodule init
   git config --local submodule.subprojects/gvc.url "$srcdir/libgnome-volume-control"
   git submodule update

Added: hack-detached.diff
===================================================================
--- hack-detached.diff	                        (rev 0)
+++ hack-detached.diff	2019-03-17 02:43:12 UTC (rev 348538)
@@ -0,0 +1,17 @@
+diff --git i/js/misc/weather.js w/js/misc/weather.js
+index aaec36cf4..3b09c28c1 100644
+--- i/js/misc/weather.js
++++ w/js/misc/weather.js
+@@ -183,10 +183,8 @@ var WeatherClient = class {
+ 
+     _onGClueLocationChanged() {
+         let geoLocation = this._gclueService.location;
+-        let location = GWeather.Location.new_detached(geoLocation.description,
+-                                                      null,
+-                                                      geoLocation.latitude,
+-                                                      geoLocation.longitude);
++        let location = this._world.find_nearest_city(geoLocation.latitude,
++                                                     geoLocation.longitude);
+         this._setLocation(location);
+     }
+