commit: 0a302053d3e716e3a566073d1b598306fc8f0e87
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 20:13:24 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 21:00:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a302053
mail-client/geary: Remove vala version restrictions
Also bump to EAPI=8 and add Python 3.11 compatibility while we're here.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
...bility-issues-with-initializer-of-constan.patch | 40 ++++++++++++++++++++++
...Lru-Workaround-missing-generic-type-argum.patch | 25 ++++++++++++++
.../{geary-40.0-r1.ebuild => geary-40.0-r2.ebuild} | 10 +++---
3 files changed, 70 insertions(+), 5 deletions(-)
diff --git
a/mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch
b/mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch
new file mode 100644
index 000000000000..3772fe81c99a
--- /dev/null
+++
b/mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch
@@ -0,0 +1,40 @@
+From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ric...@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 6ce19ce2..e6ba8533 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;
+
+
+--
+2.35.1
+
diff --git
a/mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch
b/mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch
new file mode 100644
index 000000000000..4b9ecbec18b5
--- /dev/null
+++
b/mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch
@@ -0,0 +1,25 @@
+From 0f75e7a84a39492d0748cec2ba6028e08cae3644 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ric...@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 f054e32e..ecc275e8 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;
+ }
+--
+2.35.1
+
diff --git a/mail-client/geary/geary-40.0-r1.ebuild
b/mail-client/geary/geary-40.0-r2.ebuild
similarity index 91%
rename from mail-client/geary/geary-40.0-r1.ebuild
rename to mail-client/geary/geary-40.0-r2.ebuild
index 46711534adaf..6b149be7cd8b 100644
--- a/mail-client/geary/geary-40.0-r1.ebuild
+++ b/mail-client/geary/geary-40.0-r2.ebuild
@@ -1,10 +1,8 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_MIN_API_VERSION="0.48"
-VALA_MAX_API_VERSION="0.54"
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
inherit gnome.org gnome2-utils meson python-any-r1 vala virtualx xdg
@@ -70,11 +68,13 @@ BDEPEND="
"
PATCHES=(
+
"${FILESDIR}"/${PV}-Fix-accessibility-issues-with-initializer-of-constan.patch
+
"${FILESDIR}"/${PV}-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch
"${FILESDIR}"/${PV}-Correct-the-conditional-comments-in-the-test-data.patch
)
src_prepare() {
- vala_src_prepare
+ vala_setup
gnome2_environment_reset
default
}
