MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-01-06 09:15:45 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

geary: Fix build failures with latest vala

Browse Source 
Backport needed patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2022-03-24 09:29:15 -07:00
parent 4ab47d303e
commit b5bbdd3964
3 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
meta-gnome/recipes-connectivity/geary/geary/0001-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch Normal file
View File

@ -0,0 +1,27 @@
From 166198735e9f4fbe91557df1351b3481bcf79e78 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 30 Jan 2022 19:54:11 +0100
Subject: [PATCH 1/2] Util.Cache.Lru: Workaround missing generic type argument
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/geary/-/commit/0f75e7a84a39492d0748cec2ba6028e08cae3644]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
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

42
meta-gnome/recipes-connectivity/geary/geary/0002-Fix-accessibility-issues-with-initializer-of-constan.patch Normal file
View File

@ -0,0 +1,42 @@
From 64b56e75a54a9fa3f37c7686be97a5c8818413a4 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Tue, 30 Nov 2021 15:31:31 +0100
Subject: [PATCH 2/2] Fix accessibility issues with initializer of constants
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/geary/-/commit/9bd4c82952a0a2c3308c5cc86c0b85650c1fb484]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
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

2
meta-gnome/recipes-connectivity/geary/geary_40.0.bb
View File

@ -34,6 +34,8 @@ inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala featu
SRC_URI = " \
git://github.com/GNOME/geary.git;nobranch=1;protocol=https \
file://0001-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch \
file://0002-Fix-accessibility-issues-with-initializer-of-constan.patch \
"
S = "${WORKDIR}/git"