[planner: 21/40] Drop unnecessary libecal dep for eds plugin

[Mart Raudsepp <mraudsepp src gnome org>]

commit 73a0319070f05740cdcb2505b927cf0178549729
Author: Mart Raudsepp <leio gentoo org>
Date:   Wed Mar 4 11:59:17 2020 +0200

    Drop unnecessary libecal dep for eds plugin
    
    evolution-data-server-3.33 and newer has a new API for libecal, but the
    eds plugin isn't actually using it beyond unnecessarily including the header,
    so just drop the header inclusion and dep to make it compatible with newer eds

 configure.ac             | 1 -
 meson.build              | 7 +------
 src/meson.build          | 4 ++--
 src/planner-eds-plugin.c | 2 --
 4 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a62d505f..622e13f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,7 +249,6 @@ if test "x$enable_eds" = "xyes" ; then
     EDS_PACKAGE=1.2
     PKG_CHECK_MODULES(EDS, 
     [
-               libecal-$EDS_PACKAGE >= $EDS_REQUIRED
                libebook-$EDS_PACKAGE >= $EDS_REQUIRED
     ])
     use_eds=yes
diff --git a/meson.build b/meson.build
index 58c782c7..ec5a056f 100644
--- a/meson.build
+++ b/meson.build
@@ -51,12 +51,7 @@ endif
 python = pymod.find_installation('python2', required: get_option('python'))
 python_dep = python.dependency()
 
-libecal_dep = dependency('libecal-1.2', version: eds_req, required: get_option('eds'))
-libebook_dep = dependency('libebook-1.2', version: eds_req, required: get_option('eds'))
-have_eds = false
-if libecal_dep.found() and libebook_dep.found()
-  have_eds = true
-endif
+libeds_dep = dependency('libebook-1.2', version: eds_req, required: get_option('eds'))
 
 libplanner_deps = [glib_dep, gmodule_dep, gobject_dep, libxml_dep, m_dep,]
 planner_deps = [glib_dep, gobject_dep, gmodule_dep, gtk_dep, gnomecanvas_dep, glade_dep, gconf_dep]
diff --git a/src/meson.build b/src/meson.build
index 832bd188..0cb19a31 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -116,10 +116,10 @@ if pygtk_dep.found() and python_dep.found()
   )
 endif
 
-if have_eds
+if libeds_dep.found()
   libeds_plugin_srcs = [ 'planner-eds-plugin.c' ]
   libeds_plugin_module = shared_module('eds-plugin', [libeds_plugin_srcs],
-    dependencies: [planner_deps, libecal_dep, libebook_dep],
+    dependencies: [planner_deps, libeds_dep],
     include_directories: [toplevel_inc],
     install: true,
     install_dir: join_paths(get_option('libdir'), 'planner/plugins'),
diff --git a/src/planner-eds-plugin.c b/src/planner-eds-plugin.c
index a8229c9d..7ccb3c9b 100644
--- a/src/planner-eds-plugin.c
+++ b/src/planner-eds-plugin.c
@@ -39,8 +39,6 @@
 
 /* Evolution Data Server sources */
 #include <libedataserver/libedataserver.h>
-/* Calendar */
-#include <libecal/libecal.h>
 /* Addressbook */
 #include <libebook/libebook.h>