[arch-commits] Commit in gnome-calendar/trunk (3 files)

[Jan Steffens]

    Date: Saturday, April 2, 2022 @ 21:53:59
  Author: heftig
Revision: 441321

42.0-1

Added:
  gnome-calendar/trunk/0001-weather-service-Reduce-location-accuracy.patch
    (from rev 441320, gnome-calendar/trunk/reduce-location-accuracy.diff)
Modified:
  gnome-calendar/trunk/PKGBUILD
Deleted:
  gnome-calendar/trunk/reduce-location-accuracy.diff

-----------------------------------------------------+
 0001-weather-service-Reduce-location-accuracy.patch |   23 ++++++++++++++++++
 PKGBUILD                                            |   20 +++++++--------
 reduce-location-accuracy.diff                       |   13 ----------
 3 files changed, 32 insertions(+), 24 deletions(-)

Copied: gnome-calendar/trunk/0001-weather-service-Reduce-location-accuracy.patch (from rev 441320, gnome-calendar/trunk/reduce-location-accuracy.diff)
===================================================================
--- 0001-weather-service-Reduce-location-accuracy.patch	                        (rev 0)
+++ 0001-weather-service-Reduce-location-accuracy.patch	2022-04-02 21:53:59 UTC (rev 441321)
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig at archlinux.org>
+Date: Sat, 2 Apr 2022 21:40:40 +0000
+Subject: [PATCH] weather service: Reduce location accuracy
+
+This avoids activating the compass.
+---
+ src/weather/gcal-weather-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/weather/gcal-weather-service.c b/src/weather/gcal-weather-service.c
+index f8f45e33ebb2..8d05ee16ceac 100644
+--- a/src/weather/gcal-weather-service.c
++++ b/src/weather/gcal-weather-service.c
+@@ -1117,7 +1117,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);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-02 19:23:24 UTC (rev 441320)
+++ PKGBUILD	2022-04-02 21:53:59 UTC (rev 441321)
@@ -2,21 +2,22 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-calendar
-pkgver=41.2+r5+g2222a4ee
+pkgver=42.0
 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)
+depends=(evolution-data-server libsoup libadwaita libgweather-4 geoclue
+         geocode-glib gsettings-desktop-schemas gnome-control-center)
 makedepends=(git meson)
 groups=(gnome)
-_commit=2222a4ee55fc8f42bdc0f833e1a37a94f7ddc2bf  # gnome-41
+options=(debug)
+_commit=f49bec413e41a0d41be8fc59056e3029971ae846  # tags/42.0^0
 source=("git+https://gitlab.gnome.org/GNOME/gnome-calendar.git#commit=$_commit"
-        reduce-location-accuracy.diff)
+        0001-weather-service-Reduce-location-accuracy.patch)
 sha256sums=('SKIP'
-            '190f627d7a518f9104d54a4a15f3d6c8b14a08472ef3b28e63d15328d7e106e1')
+            '45441d15d60131ea2a8bd20f04aaf803ebb3e351800c1a577e77a737f770a111')
 
 pkgver() {
   cd $pkgname
@@ -26,11 +27,8 @@
 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
+  # https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/216
+  git apply -3 ../0001-weather-service-Reduce-location-accuracy.patch
 }
 
 build() {

Deleted: reduce-location-accuracy.diff
===================================================================
--- reduce-location-accuracy.diff	2022-04-02 19:23:24 UTC (rev 441320)
+++ reduce-location-accuracy.diff	2022-04-02 21:53:59 UTC (rev 441321)
@@ -1,13 +0,0 @@
-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);