From c7fb807a2f1a887d460aac060aafba8408be5cca Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Tue, 22 Aug 2017 16:06:48 +0000
Subject: gnome: Update Evolution and E-D-S to latest stable (3.24)

This removes the dependency on WebKitGtk1.
---
 gnome/strata/gnome.morph                       |  8 ++++----
 gnome/strata/gnome/evolution-data-server.morph | 15 ++++++++-------
 gnome/strata/gnome/evolution.morph             | 13 +++++--------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/gnome/strata/gnome.morph b/gnome/strata/gnome.morph
index b8ee57fb..591eb1c0 100644
--- a/gnome/strata/gnome.morph
+++ b/gnome/strata/gnome.morph
@@ -343,8 +343,8 @@ chunks:
 - name: evolution-data-server
   morph: gnome/strata/gnome/evolution-data-server.morph
   repo: upstream:evolution-data-server
-  ref: c7e3eb0e4e773e706ab170b9bfb1089ed1546eda
-  unpetrify-ref: EVOLUTION_DATA_SERVER_3_18_5
+  ref: 6ad2fc6fba46d79449be4090eafd91015d0d8cce
+  unpetrify-ref: gnome-3-24
   build-depends:
   - gnome-online-accounts
   - krb5
@@ -954,8 +954,8 @@ chunks:
 - name: evolution
   morph: gnome/strata/gnome/evolution.morph
   repo: upstream:gnome/evolution
-  ref: 6a02c7980589cf24de90c29556bc84ee2f57b832
-  unpetrify-ref: EVOLUTION_3_18_5_2
+  ref: 57b4424f7dd260b50c2f3fd12ec31948942d656e
+  unpetrify-ref: gnome-3-24
   build-depends:
   - evolution-data-server
   - clutter-gtk
diff --git a/gnome/strata/gnome/evolution-data-server.morph b/gnome/strata/gnome/evolution-data-server.morph
index bfa8671a..dfe9b55d 100644
--- a/gnome/strata/gnome/evolution-data-server.morph
+++ b/gnome/strata/gnome/evolution-data-server.morph
@@ -1,10 +1,11 @@
 name: evolution-data-server
 kind: chunk
-build-system: autotools
+build-system: cmake
 configure-commands:
-- |
-  ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc \
-               --disable-uoa --with-libdb=no \
-               --enable-vala-bindings --with-krb5=yes \
-               --with-nss-includes=/usr/include/nss \
-               --with-nspr-includes=/usr/include/nspr
+- cmake -DCMAKE_INSTALL_PREFIX="$PREFIX"
+        -DSYSCONFDIR=/etc
+        -DENABLE_INTROSPECTION=ON
+        -DENABLE_UOA=OFF
+        -DENABLE_VALA_BINDINGS=ON
+        -DWITH_LIBDB=OFF
+        -DWITH_OPENLDAP=OFF .
diff --git a/gnome/strata/gnome/evolution.morph b/gnome/strata/gnome/evolution.morph
index e0d0b1f6..fcef80e5 100644
--- a/gnome/strata/gnome/evolution.morph
+++ b/gnome/strata/gnome/evolution.morph
@@ -1,11 +1,8 @@
 name: evolution
 kind: chunk
-build-system: autotools
+build-system: cmake
 configure-commands:
-- |
-  ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc \
-               --disable-autoar --disable-libcryptui  --disable-pst-import --disable-gtkspell \
-               --disable-text-highlight --enable-contact-maps \
-               --enable-nss --enable-smime \
-               --with-nspr-includes=/usr/include/nspr --with-nspr-libs=/usr/lib \
-               --with-nss-includes=/usr/include/nss --with-nss-libs=/usr/lib/nss
+- cmake . -DCMAKE_INSTALL_PREFIX="$PREFIX" -DENABLE_AUTOAR=OFF
+          -DENABLE_CONTACT_MAPS=ON -DENABLE_GTKSPELL=OFF
+          -DENABLE_LIBCRYPTUI=OFF -DENABLE_PST_IMPORT=OFF
+          -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_YTNEF=OFF -DWITH_OPENLDAP=OFF
-- 
cgit v1.2.1