From c9415cc95a3021c338a68dc0c75fcbfb736c74a1 Mon Sep 17 00:00:00 2001
From: Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
Date: Sun, 8 Nov 2015 14:11:36 +0900
Subject: Fixing EDS build in GNOME stratum

  - Build google contacts backend

    Depend on libgdata and dont disable the configure switch

  - Build gnome-3-18 branch, the previously set tip
    was just before the 3.18 branchpoint so this is an upgrade.

  - Enable vala bindings with configure switch, this will be
    needed later to compile folks

  - Enable Kerberos 5 support, move krb5 chunk to before EDS
    and depend on it, enable the configure switch

Change-Id: I785bbf600177a336f04852268a0da1ed884a14ac
---
 strata/gnome.morph                       | 18 ++++++++++--------
 strata/gnome/evolution-data-server.morph |  7 ++++++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/strata/gnome.morph b/strata/gnome.morph
index 3b7c8613..95f72464 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -393,16 +393,23 @@ chunks:
   - gnome-online-accounts
   - liboauth
   - m4-common
+- name: krb5
+  morph: strata/gnome/krb5.morph
+  repo: upstream:krb5
+  ref: db2acb6b06e469c6c12476bec68acc7964626523
+  unpetrify-ref: master
 - name: evolution-data-server
   morph: strata/gnome/evolution-data-server.morph
   repo: upstream:evolution-data-server
-  ref: a65ecdfb144bd74d0fc8103765aac128148a8e26
-  unpetrify-ref: master
+  ref: 8d094ef96a89957d353beaa66f0cbaa04cfbfedd
+  unpetrify-ref: EVOLUTION_DATA_SERVER_3_18_1-11-g8d094ef
   build-depends:
   - gcr
+  - gnome-online-accounts
+  - krb5
+  - libgdata
   - libgweather
   - libsecret
-  - gnome-online-accounts
 - name: network-manager-applet
   repo: upstream:gnome/network-manager-applet
   ref: bbcc673af29066cfc6f0e12f04c0dd3f9937fb3a
@@ -531,11 +538,6 @@ chunks:
   unpetrify-ref: libpwquality-1.3.0
   build-depends:
   - cracklib
-- name: krb5
-  morph: strata/gnome/krb5.morph
-  repo: upstream:krb5
-  ref: db2acb6b06e469c6c12476bec68acc7964626523
-  unpetrify-ref: master
 - name: gnome-initial-setup
   morph: strata/gnome/gnome-initial-setup.morph
   repo: upstream:gnome/gnome-initial-setup
diff --git a/strata/gnome/evolution-data-server.morph b/strata/gnome/evolution-data-server.morph
index 5e7cd56a..bfa8671a 100644
--- a/strata/gnome/evolution-data-server.morph
+++ b/strata/gnome/evolution-data-server.morph
@@ -2,4 +2,9 @@ name: evolution-data-server
 kind: chunk
 build-system: autotools
 configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-uoa --with-libdb=no --disable-google --with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr
+- |
+  ./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
-- 
cgit v1.2.1