From e6d248699ead1c60e487c4adfc2c7536a0cc6cf8 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Mon, 14 Jan 2019 12:47:24 -0600
Subject: [PATCH] Fix build against new eds

This build failure was surfaced by
https://gitlab.gnome.org/GNOME/evolution-data-server/issues/73, but
gnome-calendar is at fault for defining autoptrs for types it doesn't
control.
---
 src/gcal-utils.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gcal-utils.h b/src/gcal-utils.h
index af0cf594..74345671 100644
--- a/src/gcal-utils.h
+++ b/src/gcal-utils.h
@@ -34,9 +34,12 @@
 #define gcal_clear_datetime(dt) g_clear_pointer (dt, g_date_time_unref)
 #define gcal_clear_timeout(pp) { if (pp && *pp) { g_source_remove (*pp); *pp = 0; } }
 
+#if !EDS_CHECK_VERSION (3, 31, 90)
 /* Add autoptr support for libecal */
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponent, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref)
+#endif
+
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GWeatherLocation, gweather_location_unref)
 
 GType                icaltime_get_type                           (void)            G_GNUC_CONST;