[arch-commits] Commit in gnome-shell/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Sunday, March 17, 2019 @ 02:43:24
  Author: heftig
Revision: 348539

archrelease: copy trunk to extra-x86_64

Added:
  gnome-shell/repos/extra-x86_64/PKGBUILD
    (from rev 348538, gnome-shell/trunk/PKGBUILD)
  gnome-shell/repos/extra-x86_64/hack-detached.diff
    (from rev 348538, gnome-shell/trunk/hack-detached.diff)
Deleted:
  gnome-shell/repos/extra-x86_64/PKGBUILD

--------------------+
 PKGBUILD           |  107 +++++++++++++++++++++++++++------------------------
 hack-detached.diff |   17 ++++++++
 2 files changed, 75 insertions(+), 49 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-17 02:43:12 UTC (rev 348538)
+++ PKGBUILD	2019-03-17 02:43:24 UTC (rev 348539)
@@ -1,49 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Flamelab <panosfilip at gmail.com
-
-pkgname=gnome-shell
-pkgver=3.32.0+15+gb7d79a5f0
-pkgrel=1
-epoch=1
-pkgdesc="Next generation desktop shell"
-url="https://wiki.gnome.org/Projects/GnomeShell"
-arch=(x86_64)
-license=(GPL2)
-depends=(accountsservice gcr gjs gnome-bluetooth upower gnome-session gnome-settings-daemon
-         gnome-themes-extra gsettings-desktop-schemas libcanberra-pulse libcroco libgdm libsecret
-         mutter nm-connection-editor unzip gstreamer libibus)
-makedepends=(gtk-doc gnome-control-center evolution-data-server gobject-introspection git meson
-             sassc)
-optdepends=('gnome-control-center: System settings'
-            'evolution-data-server: Evolution calendar integration')
-groups=(gnome)
-_commit=b7d79a5f063341f1773a9a8a5550a188c04efbda  # master
-source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
-sha256sums=('SKIP'
-            'SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  git submodule init
-  git config --local submodule.subprojects/gvc.url "$srcdir/libgnome-volume-control"
-  git submodule update
-}
-  
-build() {
-  arch-meson $pkgname build -D gtk_doc=true
-  ninja -C build
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-
-  # https://bugs.archlinux.org/task/37412
-  mkdir "$pkgdir/usr/share/gnome-shell/modes"
-}

Copied: gnome-shell/repos/extra-x86_64/PKGBUILD (from rev 348538, gnome-shell/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-03-17 02:43:24 UTC (rev 348539)
@@ -0,0 +1,58 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Flamelab <panosfilip at gmail.com
+
+pkgname=gnome-shell
+pkgver=3.32.0+16+g1341d5557
+pkgrel=1
+epoch=1
+pkgdesc="Next generation desktop shell"
+url="https://wiki.gnome.org/Projects/GnomeShell"
+arch=(x86_64)
+license=(GPL2)
+depends=(accountsservice gcr gjs gnome-bluetooth upower gnome-session gnome-settings-daemon
+         gnome-themes-extra gsettings-desktop-schemas libcanberra-pulse libcroco libgdm libsecret
+         mutter nm-connection-editor unzip gstreamer libibus)
+makedepends=(gtk-doc gnome-control-center evolution-data-server gobject-introspection git meson
+             sassc)
+optdepends=('gnome-control-center: System settings'
+            'evolution-data-server: Evolution calendar integration')
+groups=(gnome)
+_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"
+        hack-detached.diff)
+sha256sums=('SKIP'
+            'SKIP'
+            '939e81f682ebafd60e86d444e49dbab277fba0f00420466b5ff783568b7dc931')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+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
+}
+  
+build() {
+  arch-meson $pkgname build -D gtk_doc=true
+  ninja -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+
+  # https://bugs.archlinux.org/task/37412
+  mkdir "$pkgdir/usr/share/gnome-shell/modes"
+}

Copied: gnome-shell/repos/extra-x86_64/hack-detached.diff (from rev 348538, gnome-shell/trunk/hack-detached.diff)
===================================================================
--- hack-detached.diff	                        (rev 0)
+++ hack-detached.diff	2019-03-17 02:43:24 UTC (rev 348539)
@@ -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);
+     }
+