v44.0-1 Update to 44.0

* Update gnome-clocks to 44.0
* Update patches
* Switch from sha256 to blake2 (b2sum)

3 files changed, 69 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 67237033305b..0f7b4116d219 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,36 @@
 pkgbase = gnome-clocks-waked
 	pkgdesc = Clocks applications for GNOME (version with waked support)
-	pkgver = 43.0
-	pkgrel = 1.1
+	pkgver = 44.0
+	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/Clocks
 	arch = x86_64
 	arch = aarch64
 	groups = gnome
 	license = GPL
-	makedepends = vala
-	makedepends = gobject-introspection
-	makedepends = yelp-tools
 	makedepends = git
+	makedepends = gobject-introspection
 	makedepends = meson
-	depends = gtk4
-	depends = libgweather-4
-	depends = gnome-desktop-4
+	makedepends = vala
+	makedepends = yelp-tools
 	depends = geoclue
 	depends = geocode-glib-2
+	depends = gnome-desktop-4
 	depends = gsound
+	depends = gtk4
 	depends = libadwaita
+	depends = libgweather-4
 	depends = waked
 	provides = gnome-clocks
 	conflicts = gnome-clocks
-	options = !debug
-	source = git+https://gitlab.gnome.org/GNOME/gnome-clocks.git#commit=9877dfa0ca9fcc2fcf73fd6d96b57226380baf4a
+	source = git+https://gitlab.gnome.org/GNOME/gnome-clocks.git#commit=220460fde76ef779436dacb07bc3b0589995e608
 	source = 0001-invoke-waked-when-an-alarm-changes.patch
 	source = 0002-Add-argument-to-start-initial-instance-in-the-backgr.patch
 	source = 0003-add-lock-screen-actions.patch
 	source = gnome-clocks.desktop
-	sha256sums = SKIP
-	sha256sums = 6203b5c43ac1f23ca5c622ab75d23891de24b17e716546c5230ec89928ccf0be
-	sha256sums = a728598594b1fc7b0c40ebfa4b44ddd770dc33cc6590ef8518b987ccc4b6d0ce
-	sha256sums = 82bcab0a26dcb8a73719a690fc65c4003a2530ec27b066ea0f9336525e0e8a49
-	sha256sums = 37368c4f902facb6ed735df1c4edbd55fc477198246096929689dd0092f16fe2
+	b2sums = SKIP
+	b2sums = f63bd443f2a95b0acfc40989cdaf5b02a857fda14949731e5cdda341e8a26dcd2740bc885bf93087f25224820f1abfdc581919f16f4c47c5591e3348d6917a47
+	b2sums = 940e1bc2d1756bf8c9f7ad26c5b58a6aeb9eb2110f2ab483e6789c32336d54af2679271f5823b5ad8aabf4643cdbb97624440696606f606a64b69379eee31708
+	b2sums = fcb286f9e4ed9381aa0c6ae46c4f4b27126d1e1236e59dec4f8fd564a5fe9f9c7041764e2ce3dc38af7393a0235aa41753167ad99434ba2ddbaf4e47fe12f8d5
+	b2sums = 1c3891a84f28bf8e8cbf7d0ad8f5d17a6993f91c686986193d5cf71c46368d7d6645de718f09cd4c6b69e4ed118333d02e22b4fb507c21ca55a54135a5c594fc
 
 pkgname = gnome-clocks-waked
diff --git a/0001-invoke-waked-when-an-alarm-changes.patch b/0001-invoke-waked-when-an-alarm-changes.patch
index cb88c27ece68..bfdb9af7a902 100644
--- a/0001-invoke-waked-when-an-alarm-changes.patch
+++ b/0001-invoke-waked-when-an-alarm-changes.patch
@@ -1,4 +1,4 @@
-From 65007fd13530afe604a05ff7ab85fb71eb041936 Mon Sep 17 00:00:00 2001
+From a5f37373d2199f95ddc966b2426101bef62b4b93 Mon Sep 17 00:00:00 2001
 From: Robin Westermann <gitlab@seath.de>
 Date: Sat, 27 Feb 2021 14:41:22 +0100
 Subject: [PATCH] invoke waked when an alarm changes
@@ -13,15 +13,15 @@ Co-Authored-By: pcworld <0188801@gmail.com>
 ---
  build-aux/flatpak/org.gnome.clocks.json |  1 +
  src/alarm-face.vala                     |  2 +
- src/alarm-item.vala                     | 14 ++++++-
+ src/alarm-item.vala                     | 10 +++++
  src/alarm-setup-dialog.vala             |  1 +
  src/meson.build                         |  1 +
  src/waked-utils.vala                    | 53 +++++++++++++++++++++++++
- 6 files changed, 70 insertions(+), 2 deletions(-)
+ 6 files changed, 68 insertions(+)
  create mode 100644 src/waked-utils.vala
 
 diff --git a/build-aux/flatpak/org.gnome.clocks.json b/build-aux/flatpak/org.gnome.clocks.json
-index b3d768f..daedbf8 100644
+index a58ffcb..b009378 100644
 --- a/build-aux/flatpak/org.gnome.clocks.json
 +++ b/build-aux/flatpak/org.gnome.clocks.json
 @@ -11,6 +11,7 @@
@@ -33,10 +33,18 @@ index b3d768f..daedbf8 100644
          "--env=G_MESSAGES_DEBUG=org.gnome.ClocksDevel"
      ],
 diff --git a/src/alarm-face.vala b/src/alarm-face.vala
-index 04728ab..1a593a7 100644
+index 58950d5..edcc796 100644
 --- a/src/alarm-face.vala
 +++ b/src/alarm-face.vala
-@@ -121,6 +121,7 @@ public class Face : Adw.Bin, Clocks.Clock {
+@@ -73,6 +73,7 @@ public class Face : Adw.Bin, Clocks.Clock {
+             item.notify["active"].connect (save);
+ 
+             row.remove_alarm.connect (() => {
++                WakedUtils.remove_timer (((Item) item).id);
+                 alarms.delete_item ((Item) item);
+                 save ();
+             });
+@@ -129,6 +130,7 @@ public class Face : Adw.Bin, Clocks.Clock {
                  ((SetupDialog) dialog).apply_to_alarm (alarm);
                  save ();
              } else if (response == DELETE_ALARM) {
@@ -44,16 +52,8 @@ index 04728ab..1a593a7 100644
                  alarms.delete_item (alarm);
                  save ();
              }
-@@ -130,6 +131,7 @@ public class Face : Adw.Bin, Clocks.Clock {
-     }
- 
-     internal void delete (Item alarm) {
-+        WakedUtils.remove_timer (alarm.id);
-         alarms.delete_item (alarm);
-         save ();
-     }
 diff --git a/src/alarm-item.vala b/src/alarm-item.vala
-index 6103342..e350d1d 100644
+index 263248b..ce7678d 100644
 --- a/src/alarm-item.vala
 +++ b/src/alarm-item.vala
 @@ -20,6 +20,7 @@
@@ -64,21 +64,17 @@ index 6103342..e350d1d 100644
  private struct AlarmTime {
      public int hour;
      public int minute;
-@@ -88,8 +89,11 @@ private class Item : Object, ContentItem {
+@@ -98,6 +99,9 @@ private class Item : Object, ContentItem {
                  _active = value;
-                 if (_active) {
-                     reset ();
--                } else if (state == State.RINGING) {
--                    stop ();
-+                } else {
+ 
+                 reset ();
++                if (!active) {
 +                    WakedUtils.remove_timer (id);
-+                    if (state == State.RINGING) {
-+                        stop ();
-+                    }
++                }
+                 if (!active && state == State.RINGING) {
+                     stop ();
                  }
-                 notify_property ("active");
-             }
-@@ -150,6 +154,10 @@ private class Item : Object, ContentItem {
+@@ -161,6 +165,10 @@ private class Item : Object, ContentItem {
          }
  
          alarm_time = dt;
@@ -89,7 +85,7 @@ index 6103342..e350d1d 100644
      }
  
      private void update_snooze_time (GLib.DateTime start_time) {
-@@ -172,6 +180,7 @@ private class Item : Object, ContentItem {
+@@ -183,6 +191,7 @@ private class Item : Object, ContentItem {
      public void snooze () {
          bell.stop ();
          state = State.SNOOZING;
@@ -97,7 +93,7 @@ index 6103342..e350d1d 100644
      }
  
      public void stop () {
-@@ -221,6 +230,7 @@ private class Item : Object, ContentItem {
+@@ -232,6 +241,7 @@ private class Item : Object, ContentItem {
              update_alarm_time (); // reschedule for the next repeat
          }
  
@@ -106,7 +102,7 @@ index 6103342..e350d1d 100644
      }
  
 diff --git a/src/alarm-setup-dialog.vala b/src/alarm-setup-dialog.vala
-index 30163f3..a838993 100644
+index 5d122cd..b6f66e9 100644
 --- a/src/alarm-setup-dialog.vala
 +++ b/src/alarm-setup-dialog.vala
 @@ -264,6 +264,7 @@ private class SetupDialog : Gtk.Dialog {
@@ -118,7 +114,7 @@ index 30163f3..a838993 100644
  
          var duplicate = alarm.check_duplicate_alarm (other_alarms);
 diff --git a/src/meson.build b/src/meson.build
-index 61bf1ab..129e9a3 100644
+index dfc7d34..ab9de1c 100644
 --- a/src/meson.build
 +++ b/src/meson.build
 @@ -24,6 +24,7 @@ clocks_vala_sources = files(
@@ -189,5 +185,5 @@ index 0000000..9b8fa4a
 +}
 +}
 -- 
-2.35.1
+2.37.2
 
diff --git a/PKGBUILD b/PKGBUILD
index 62d44d73a091..639e4c6349a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,46 @@
-# Maintainer: lectrode <electrodexsnet@gmail.com>
-# Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+# Maintainer: lectrode (electrodexsnet@gmail.com)
 # Contributor: Edgar Vincent <e-v@posteo.net>
+# Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 
 _pkgname=gnome-clocks
 pkgname=${_pkgname}-waked
-pkgver=43.0
-pkgrel=1.1
+pkgver=44.0
+pkgrel=1
 pkgdesc="Clocks applications for GNOME (version with waked support)"
 url="https://wiki.gnome.org/Apps/Clocks"
 arch=(x86_64 aarch64)
 license=(GPL)
 provides=($_pkgname)
 conflicts=($_pkgname)
-depends=(gtk4 libgweather-4 gnome-desktop-4 geoclue geocode-glib-2 gsound
-         libadwaita waked)
-makedepends=(vala gobject-introspection yelp-tools git meson)
+depends=(
+  geoclue
+  geocode-glib-2
+  gnome-desktop-4
+  gsound
+  gtk4
+  libadwaita
+  libgweather-4
+  waked
+)
+makedepends=(
+  git
+  gobject-introspection
+  meson
+  vala
+  yelp-tools
+)
 groups=(gnome)
-options=(!debug)
-_commit=9877dfa0ca9fcc2fcf73fd6d96b57226380baf4a  # tags/43.0^0
+_commit=220460fde76ef779436dacb07bc3b0589995e608  # tags/44.0^0
 source=("git+https://gitlab.gnome.org/GNOME/gnome-clocks.git#commit=$_commit"
         '0001-invoke-waked-when-an-alarm-changes.patch'
         '0002-Add-argument-to-start-initial-instance-in-the-backgr.patch'
         '0003-add-lock-screen-actions.patch'
         'gnome-clocks.desktop')
-sha256sums=('SKIP'
-            '6203b5c43ac1f23ca5c622ab75d23891de24b17e716546c5230ec89928ccf0be'
-            'a728598594b1fc7b0c40ebfa4b44ddd770dc33cc6590ef8518b987ccc4b6d0ce'
-            '82bcab0a26dcb8a73719a690fc65c4003a2530ec27b066ea0f9336525e0e8a49'
-            '37368c4f902facb6ed735df1c4edbd55fc477198246096929689dd0092f16fe2')
+b2sums=('SKIP'
+            'f63bd443f2a95b0acfc40989cdaf5b02a857fda14949731e5cdda341e8a26dcd2740bc885bf93087f25224820f1abfdc581919f16f4c47c5591e3348d6917a47'
+            '940e1bc2d1756bf8c9f7ad26c5b58a6aeb9eb2110f2ab483e6789c32336d54af2679271f5823b5ad8aabf4643cdbb97624440696606f606a64b69379eee31708'
+            'fcb286f9e4ed9381aa0c6ae46c4f4b27126d1e1236e59dec4f8fd564a5fe9f9c7041764e2ce3dc38af7393a0235aa41753167ad99434ba2ddbaf4e47fe12f8d5'
+            '1c3891a84f28bf8e8cbf7d0ad8f5d17a6993f91c686986193d5cf71c46368d7d6645de718f09cd4c6b69e4ed118333d02e22b4fb507c21ca55a54135a5c594fc')
 
 pkgver() {
   cd $_pkgname