From 3bb4ee4ba1161cff3b8c22dc07aa130ac2de9789 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Mon, 7 Nov 2022 20:04:50 +0100
Subject: geary: update 40.0 -> 43.0

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-connectivity/geary/geary_40.0.bb       | 61 ----------------------
 .../recipes-connectivity/geary/geary_43.0.bb       | 60 +++++++++++++++++++++
 2 files changed, 60 insertions(+), 61 deletions(-)
 delete mode 100644 meta-gnome/recipes-connectivity/geary/geary_40.0.bb
 create mode 100644 meta-gnome/recipes-connectivity/geary/geary_43.0.bb

diff --git a/meta-gnome/recipes-connectivity/geary/geary_40.0.bb b/meta-gnome/recipes-connectivity/geary/geary_40.0.bb
deleted file mode 100644
index 3ff0a412e2..0000000000
--- a/meta-gnome/recipes-connectivity/geary/geary_40.0.bb
+++ /dev/null
@@ -1,61 +0,0 @@
-SUMMARY = "Geary is an email application built around conversations, for the GNOME 3 desktop."
-SECTION = "network"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2a2244d5a13871ad950c55877546a6a2"
-
-DEPENDS = " \
-    appstream-glib \
-    cairo \
-    enchant2 \
-    evolution-data-server \
-    folks \
-    gcr \
-    gmime \
-    gnome-online-accounts \
-    gsound \
-    gspell \
-    gtk+3 \
-    icu \
-    iso-codes \
-    json-glib \
-    libhandy \
-    libical \
-    libpeas \
-    libsecret \
-    libstemmer \
-    libxml2 \
-    sqlite3 \
-    webkitgtk \
-"
-
-RDEPENDS:${PN} = "gnome-keyring"
-
-inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala features_check
-
-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"
-SRCREV = "e561775c1580a9f60a726355b2b897bfc9cb3382"
-
-ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
-
-GIR_MESON_OPTION = ""
-EXTRA_OEMESON = "-Dprofile=release"
-
-PACKAGECONFIG[libunwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
-PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef"
-PACKAGECONFIG[valadoc] = "-Dvaladoc=enabled,-Dvaladoc=disabled"
-
-PACKAGECONFIG ??= ""
-# rfc822/rfc822-message.c:2097:12: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'gboolean' (aka 'int') [-Wint-conversion]
-#|                                 return NULL;
-#|                                        ^~~~
-CFLAGS:append:toolchain-clang = " -Wno-error=int-conversion"
-
-FILES:${PN} += "${datadir}"
-
diff --git a/meta-gnome/recipes-connectivity/geary/geary_43.0.bb b/meta-gnome/recipes-connectivity/geary/geary_43.0.bb
new file mode 100644
index 0000000000..8dd0ea67d0
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/geary/geary_43.0.bb
@@ -0,0 +1,60 @@
+SUMMARY = "Geary is an email application built around conversations, for the GNOME 3 desktop."
+SECTION = "network"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2a2244d5a13871ad950c55877546a6a2"
+
+DEPENDS = " \
+    appstream-glib \
+    cairo \
+    desktop-file-utils-native \
+    enchant2 \
+    evolution-data-server \
+    folks \
+    gcr \
+    gmime \
+    gnome-online-accounts \
+    gsound \
+    gspell \
+    gtk+3 \
+    icu \
+    iso-codes \
+    json-glib \
+    libhandy \
+    libical \
+    libpeas \
+    libsecret \
+    libstemmer \
+    libxml2 \
+    sqlite3 \
+    webkitgtk \
+"
+
+RDEPENDS:${PN} = "gnome-keyring"
+
+inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala features_check
+
+SRC_URI = " \
+	git://github.com/GNOME/geary.git;nobranch=1;protocol=https \
+"
+
+S = "${WORKDIR}/git"
+SRCREV = "94d6bec861daffb27efea85a296f347db7a5af6d"
+
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+
+GIR_MESON_OPTION = ""
+EXTRA_OEMESON = "-Dprofile=release"
+
+PACKAGECONFIG[libunwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
+PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef"
+PACKAGECONFIG[valadoc] = "-Dvaladoc=enabled,-Dvaladoc=disabled"
+
+PACKAGECONFIG ??= ""
+# rfc822/rfc822-message.c:2097:12: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'gboolean' (aka 'int') [-Wint-conversion]
+#|                                 return NULL;
+#|                                        ^~~~
+CFLAGS:append:toolchain-clang = " -Wno-error=int-conversion"
+
+FILES:${PN} += "${datadir}"
+
-- 
cgit v1.2.3-54-g00ecf