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

[Jan Steffens]

    Date: Thursday, February 10, 2022 @ 18:24:41
  Author: heftig
Revision: 436885

archrelease: copy trunk to extra-x86_64

Added:
  gnome-calendar/repos/extra-x86_64/PKGBUILD
    (from rev 436883, gnome-calendar/trunk/PKGBUILD)
  gnome-calendar/repos/extra-x86_64/reduce-location-accuracy.diff
    (from rev 436883, gnome-calendar/trunk/reduce-location-accuracy.diff)
Deleted:
  gnome-calendar/repos/extra-x86_64/PKGBUILD

-------------------------------+
 PKGBUILD                      |   90 +++++++++++++++++++++-------------------
 reduce-location-accuracy.diff |   13 +++++
 2 files changed, 62 insertions(+), 41 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-10 18:24:41 UTC (rev 436884)
+++ PKGBUILD	2022-02-10 18:24:41 UTC (rev 436885)
@@ -1,41 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-calendar
-pkgver=41.2
-pkgrel=1
-pkgdesc="Simple and beautiful calendar application designed to perfectly fit the GNOME desktop"
-url="https://wiki.gnome.org/Apps/Calendar"
-arch=(x86_64)
-license=(GPL)
-depends=(evolution-data-server gsettings-desktop-schemas gnome-control-center
-         libdazzle libhandy)
-makedepends=(git meson)
-groups=(gnome)
-_commit=deb9ff18302457b91fb8013f98880c8e3a548c19  # tags/41.2^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-calendar.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-}
-
-build() {
-  arch-meson $pkgname build
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  meson install -C build --destdir "$pkgdir"
-}
-
-# vim:set sw=2 et:

Copied: gnome-calendar/repos/extra-x86_64/PKGBUILD (from rev 436883, gnome-calendar/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-02-10 18:24:41 UTC (rev 436885)
@@ -0,0 +1,49 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-calendar
+pkgver=41.2+r5+g2222a4ee
+pkgrel=1
+pkgdesc="Simple and beautiful calendar application designed to perfectly fit the GNOME desktop"
+url="https://wiki.gnome.org/Apps/Calendar"
+arch=(x86_64)
+license=(GPL)
+depends=(evolution-data-server gsettings-desktop-schemas gnome-control-center
+         libdazzle libhandy)
+makedepends=(git meson)
+groups=(gnome)
+_commit=2222a4ee55fc8f42bdc0f833e1a37a94f7ddc2bf  # gnome-41
+source=("git+https://gitlab.gnome.org/GNOME/gnome-calendar.git#commit=$_commit"
+        reduce-location-accuracy.diff)
+sha256sums=('SKIP'
+            '190f627d7a518f9104d54a4a15f3d6c8b14a08472ef3b28e63d15328d7e106e1')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # Fix build with Meson 0.61
+  git cherry-pick -n e35dbc1acd03dd1751b755b6c8e1932a692ad4e1
+
+  # Reduce accuracy of location requests
+  git apply -3 ../reduce-location-accuracy.diff
+}
+
+build() {
+  arch-meson $pkgname build
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  meson install -C build --destdir "$pkgdir"
+}
+
+# vim:set sw=2 et:

Copied: gnome-calendar/repos/extra-x86_64/reduce-location-accuracy.diff (from rev 436883, gnome-calendar/trunk/reduce-location-accuracy.diff)
===================================================================
--- reduce-location-accuracy.diff	                        (rev 0)
+++ reduce-location-accuracy.diff	2022-02-10 18:24:41 UTC (rev 436885)
@@ -0,0 +1,13 @@
+diff --git i/src/weather/gcal-weather-service.c w/src/weather/gcal-weather-service.c
+index 9fbedb51..57f88160 100644
+--- i/src/weather/gcal-weather-service.c
++++ w/src/weather/gcal-weather-service.c
+@@ -1118,7 +1118,7 @@ gcal_weather_service_run (GcalWeatherService *self,
+       g_cancellable_reset (self->location_cancellable);
+ 
+       gclue_simple_new (APPLICATION_ID,
+-                        GCLUE_ACCURACY_LEVEL_EXACT,
++                        GCLUE_ACCURACY_LEVEL_CITY,
+                         self->location_cancellable,
+                         (GAsyncReadyCallback) on_gclue_simple_creation_cb,
+                         self);