geary: Fix build with vala >= 0.56.8
PATCH 1/1 geary: Fix build with vala >= 0.56.8
Backport two patches from main branch
Signed-off-by Khem Raj <[email protected]>
Cc Alexander Kanavin <[email protected]>
--- ...ng-type-arguments-for-interfaces-to-.patch | 59 +++++++ ...t-Fix-non-null-build-with-newer-vala.patch | 156 ++++++++++++++++++ .../recipes-connectivity/geary/geary_43.0.bb | 2 + 3 files changed, 217 insertions(+) create mode 100644 meta-gnome/recipes-connectivity/geary/geary/0001-client-Add-missing-type-arguments-for-interfaces-to-.patch create mode 100644 meta-gnome/recipes-connectivity/geary/geary/0001-vala-unit-Fix-non-null-build-with-newer-vala.patch
meta-gnome/recipes-connectivity/geary/geary/0001-client-Add-missing-type-arguments-for-interfaces-to-.patch new file +59 -0
@@ -0,0 +1,59 @@ +From 19dddc4b8acaeefc505e1b45f53048901839aede Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz <[email protected]> +Date: Sat, 8 Apr 2023 13:06:50 +0200 +Subject: [PATCH] client: Add missing type-arguments for interfaces to fix build with newer vala + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/geary/-/commit/4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c] +Signed-off-by: Khem Raj <[email protected]> +--- + src/client/accounts/accounts-editor-row.vala | 2 +- + src/client/accounts/accounts-editor-servers-pane.vala | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/client/accounts/accounts-editor-row.vala b/src/client/accounts/accounts-editor-row.vala +index 6e7ac2ab..70223d71 100644 +--- a/src/client/accounts/accounts-editor-row.vala ++++ b/src/client/accounts/accounts-editor-row.vala +@@ -386,7 +386,7 @@ private abstract class Accounts.ServiceRow<PaneType,V> : AccountRow<PaneType,V> + + + /** Interface for rows that use a validator for editable values. */ +-internal interface Accounts.ValidatingRow : EditorRow { ++internal interface Accounts.ValidatingRow<PaneType> : EditorRow<PaneType> { + + + /** The row's validator */ +diff --git a/src/client/accounts/accounts-editor-servers-pane.vala b/src/client/accounts/accounts-editor-servers-pane.vala +index 8bd9bde1..982acd5c 100644 +--- a/src/client/accounts/accounts-editor-servers-pane.vala ++++ b/src/client/accounts/accounts-editor-servers-pane.vala +@@ -694,7 +694,7 @@ private class Accounts.SaveSentRow : + + + private class Accounts.ServiceHostRow : +- ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow { ++ ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow<EditorServersPane> { + + + public Components.Validator validator { +@@ -848,7 +848,7 @@ private class Accounts.ServiceSecurityRow : + + + private class Accounts.ServiceLoginRow : +- ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow { ++ ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow<EditorServersPane> { + + + public Components.Validator validator { +@@ -972,7 +972,7 @@ private class Accounts.ServiceLoginRow : + + + private class Accounts.ServicePasswordRow : +- ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow { ++ ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow<EditorServersPane> { + + + public Components.Validator validator { +-- +2.41.0 +
meta-gnome/recipes-connectivity/geary/geary/0001-vala-unit-Fix-non-null-build-with-newer-vala.patch new file +156 -0
156 lines not on this page · raw message
meta-gnome/recipes-connectivity/geary/geary_43.0.bb +2 -0
@@ -36,6 +36,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-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch \ + file://0001-client-Add-missing-type-arguments-for-interfaces-to-.patch \ + file://0001-vala-unit-Fix-non-null-build-with-newer-vala.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.41.0