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

[Jan Steffens]

    Date: Wednesday, April 3, 2019 @ 18:39:14
  Author: heftig
Revision: 349811

3.32.0+46+gfea019277-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-03 18:14:10 UTC (rev 349810)
+++ PKGBUILD	2019-04-03 18:39:14 UTC (rev 349811)
@@ -3,7 +3,7 @@
 # Contributor: Flamelab <panosfilip at gmail.com
 
 pkgname=gnome-shell
-pkgver=3.32.0+20+g05e55cee2
+pkgver=3.32.0+46+gfea019277
 pkgrel=1
 epoch=1
 pkgdesc="Next generation desktop shell"
@@ -18,13 +18,11 @@
 optdepends=('gnome-control-center: System settings'
             'evolution-data-server: Evolution calendar integration')
 groups=(gnome)
-_commit=05e55cee23d65206f3c3f2d12f4a4d659061651f  # master
+_commit=fea01927720e5d73e14e1649ee36cc6c60835d6f  # master
 source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
-        hack-detached.diff)
+        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
 sha256sums=('SKIP'
-            'SKIP'
-            '939e81f682ebafd60e86d444e49dbab277fba0f00420466b5ff783568b7dc931')
+            'SKIP')
 
 pkgver() {
   cd $pkgname
@@ -34,9 +32,6 @@
 prepare() {
   cd $pkgname
 
-  # 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

Deleted: hack-detached.diff
===================================================================
--- hack-detached.diff	2019-04-03 18:14:10 UTC (rev 349810)
+++ hack-detached.diff	2019-04-03 18:39:14 UTC (rev 349811)
@@ -1,17 +0,0 @@
-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);
-     }
-