From 99c1bce460ea1d0129a02542be7d3f96735f07b8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH] geary: update to 43.0.

---
 srcpkgs/geary/patches/vala-0.56a.patch | 25 ----------------
 srcpkgs/geary/patches/vala-0.56b.patch | 40 --------------------------
 srcpkgs/geary/template                 | 15 +++++-----
 3 files changed, 8 insertions(+), 72 deletions(-)
 delete mode 100644 srcpkgs/geary/patches/vala-0.56a.patch
 delete mode 100644 srcpkgs/geary/patches/vala-0.56b.patch

diff --git a/srcpkgs/geary/patches/vala-0.56a.patch b/srcpkgs/geary/patches/vala-0.56a.patch
deleted file mode 100644
index df2c3902db1..00000000000
--- a/srcpkgs/geary/patches/vala-0.56a.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0f75e7a84a39492d0748cec2ba6028e08cae3644 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Sun, 30 Jan 2022 19:54:11 +0100
-Subject: [PATCH] Util.Cache.Lru: Workaround missing generic type argument
-
----
- src/client/util/util-cache.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala
-index f054e32e5..ecc275e84 100644
---- a/src/client/util/util-cache.vala
-+++ b/src/client/util/util-cache.vala
-@@ -12,7 +12,7 @@ public class Util.Cache.Lru<T> : Geary.BaseObject {
-     private class CacheEntry<T> {
- 
- 
--        public static int lru_compare(CacheEntry<T> a, CacheEntry<T> b) {
-+        public static int lru_compare(CacheEntry a, CacheEntry b) {
-             if (a.key == b.key) {
-                 return 0;
-             }
--- 
-GitLab
-
diff --git a/srcpkgs/geary/patches/vala-0.56b.patch b/srcpkgs/geary/patches/vala-0.56b.patch
deleted file mode 100644
index 2d071a13375..00000000000
--- a/srcpkgs/geary/patches/vala-0.56b.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Tue, 30 Nov 2021 15:31:31 +0100
-Subject: [PATCH] Fix accessibility issues with initializer of constants
-
----
- src/client/application/application-client.vala | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
-index 6ce19ce2a..e6ba85331 100644
---- a/src/client/application/application-client.vala
-+++ b/src/client/application/application-client.vala
-@@ -8,16 +8,16 @@
- 
- // Defined by CMake build script.
- extern const string GETTEXT_PACKAGE;
--extern const string _APP_ID;
--extern const string _BUILD_ROOT_DIR;
--extern const string _GSETTINGS_DIR;
--extern const string _INSTALL_PREFIX;
--extern const string _NAME_SUFFIX;
-+public extern const string _APP_ID;
-+public extern const string _BUILD_ROOT_DIR;
-+public extern const string _GSETTINGS_DIR;
-+public extern const string _INSTALL_PREFIX;
-+public extern const string _NAME_SUFFIX;
- extern const string _PLUGINS_DIR;
- extern const string _PROFILE;
- extern const string _REVNO;
--extern const string _SOURCE_ROOT_DIR;
--extern const string _VERSION;
-+public extern const string _SOURCE_ROOT_DIR;
-+public extern const string _VERSION;
- extern const string _WEB_EXTENSIONS_DIR;
- 
- 
--- 
-GitLab
-
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index e1360898bfd..4be416e38a4 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,14 +1,14 @@
 # Template file for 'geary'
 pkgname=geary
-version=40.0
-revision=5
+version=43.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
- gobject-introspection vala glib-devel gettext"
-makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
- libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
+ gobject-introspection vala glib-devel gettext gtk-update-icon-cache"
+makedepends="enchant2-devel gcr-devel gmime3-devel libsoup3-devel libglib-devel
+ libgee08-devel libsecret-devel libwebkit2gtk41-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
  libpeas-devel gsound-devel libstemmer-devel"
@@ -17,8 +17,9 @@ short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cam@nohom.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
-checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+changelog="https://gitlab.gnome.org/GNOME/geary/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/geary/${version%.*}/geary-${version}.tar.xz"
+checksum=489166f87dd9d29011f5e5b79694f2588b473f7e191c59ce9013c8c8e0e363e7
 make_check=no # tests fail with a webkit process crash
 
 post_patch() {