[packages/geary] upstream fixes for new vala

[atler]

commit e47c8b4c739e31d5c7fb36d11834a7da23698e57
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Jun 7 10:56:48 2022 +0200

    upstream fixes for new vala

 geary.spec |  2 ++
 vala.patch | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
---
diff --git a/geary.spec b/geary.spec
index afe6ccc..44f4b44 100644
--- a/geary.spec
+++ b/geary.spec
@@ -12,6 +12,7 @@ Group:		X11/Applications/Mail
 Source0:	https://download.gnome.org/sources/geary/40/%{name}-%{version}.tar.xz
 # Source0-md5:	cb7b0af62e870ef77d65b3a2631ebb55
 Patch0:		%{name}-meson.patch
+Patch1:		vala.patch
 URL:		https://wiki.gnome.org/Apps/Geary
 BuildRequires:	appstream-glib-devel >= 0.7.10
 BuildRequires:	cairo-devel
@@ -106,6 +107,7 @@ interfejsem.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %if %{without unity}
 %{__sed} -i -e '/^subdir.*messaging-menu/ d' src/client/plugin/meson.build
diff --git a/vala.patch b/vala.patch
new file mode 100644
index 0000000..c07dfa3
--- /dev/null
+++ b/vala.patch
@@ -0,0 +1,65 @@
+From 0f75e7a84a39492d0748cec2ba6028e08cae3644 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz at 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
+
+From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz at 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
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/geary.git/commitdiff/e47c8b4c739e31d5c7fb36d11834a7da23698e57