[gnome-continuous] Update the evolution and eds build-api patches

[Emmanuele Bassi <ebassi src gnome org>]

commit 6bc6c06609efb14e5bac6b7849c29e0818222a76
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri May 11 12:54:55 2018 +0100

    Update the evolution and eds build-api patches

 patches/eds-cmake-buildapi.patch |   31 ++++++++++++++++++++++++-------
 patches/evolution-buildapi.patch |   13 ++++++++-----
 2 files changed, 32 insertions(+), 12 deletions(-)
---
diff --git a/patches/eds-cmake-buildapi.patch b/patches/eds-cmake-buildapi.patch
index 6c1304e..bf6cfaf 100644
--- a/patches/eds-cmake-buildapi.patch
+++ b/patches/eds-cmake-buildapi.patch
@@ -1,4 +1,4 @@
-From 6f2b7a5d7753deaeb9189323721d1247001ca0ab Mon Sep 17 00:00:00 2001
+From 30d7307359733d2bd79c1c2e192797cc0f7cc05f Mon Sep 17 00:00:00 2001
 From: Emmanuele Bassi <ebassi gnome org>
 Date: Fri, 21 Oct 2016 04:13:24 +0530
 Subject: [PATCH] build: Add a "configure" script implementing the GNOME Build
@@ -6,20 +6,32 @@ Subject: [PATCH] build: Add a "configure" script implementing the GNOME Build
 
 See http://people.gnome.org/~walters/docs/build-api.txt
 
+v6:
+  - Rename SHARE_INSTALL_DIR to SHARE_INSTALL_PREFIX
+
+v5:
+  - Remove unused option GOOGLE_AUTH: OAuth2 is supported
+
+v4:
+  - Update the paths for CMake installation prefixes
+
+v3:
+  - Update the overrides for CMake
+
 v2:
   - Use the Ninja generator for CMake
   - Perform various sanity checks
 ---
- configure | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 101 insertions(+)
+ configure | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 106 insertions(+)
  create mode 100755 configure
 
 diff --git a/configure b/configure
 new file mode 100755
-index 0000000..fd3dfbb
+index 000000000..7026ccfc6
 --- /dev/null
 +++ b/configure
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,106 @@
 +#!/bin/bash
 +# configure script adapter for cmake
 +# Copyright 2010, 2011, 2013 Colin Walters <walters verbum org>
@@ -115,12 +127,17 @@ index 0000000..fd3dfbb
 +     -DENABLE_INTROSPECTION=true \
 +     -DENABLE_VALA_BINDINGS=ON \
 +     -DENABLE_UOA=OFF \
-+     -DENABLE_GOOGLE_AUTH=OFF \
 +     -DENABLE_INSTALLED_TESTS=ON \
 +     -DWITH_OPENLDAP=OFF \
 +     -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
++     -DBIN_INSTALL_DIR:PATH=${bindir} \
++     -DINCLUDE_INSTALL_DIR:PATH=${includedir} \
++     -DLIB_INSTALL_DIR:PATH=${libdir} \
++     -DLIBEXEC_INSTALL_DIR:PATH=${libexecdir} \
++     -DSHARE_INSTALL_PREFIX:PATH=${datadir} \
++     -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \
 +     -GNinja \
 +     ${srcdir}
 -- 
-2.9.3
+2.17.0
 
diff --git a/patches/evolution-buildapi.patch b/patches/evolution-buildapi.patch
index d781de9..507e1ed 100644
--- a/patches/evolution-buildapi.patch
+++ b/patches/evolution-buildapi.patch
@@ -1,4 +1,4 @@
-From a2a682b339930221c058859ac7964fd5015c1814 Mon Sep 17 00:00:00 2001
+From d6a1c1b4818900aac6ccd9436588517e1fb81517 Mon Sep 17 00:00:00 2001
 From: Emmanuele Bassi <ebassi gnome org>
 Date: Fri, 21 Oct 2016 04:13:24 +0530
 Subject: [PATCH] build: Add a "configure" script implementing the GNOME Build
@@ -6,6 +6,9 @@ Subject: [PATCH] build: Add a "configure" script implementing the GNOME Build
 
 See http://people.gnome.org/~walters/docs/build-api.txt
 
+v4:
+  - Rename SHARE_INSTALL_DIR to SHARE_INSTALL_PREFIX
+
 v3:
   - Update the overrides for CMake
 
@@ -13,13 +16,13 @@ v2:
   - Use the Ninja generator for CMake
   - Perform various sanity checks
 ---
- configure | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 107 insertions(+)
  create mode 100755 configure
 
 diff --git a/configure b/configure
 new file mode 100755
-index 0000000..7b8c446
+index 0000000000..ad3399ee66
 --- /dev/null
 +++ b/configure
 @@ -0,0 +1,107 @@
@@ -126,10 +129,10 @@ index 0000000..7b8c446
 +     -DINCLUDE_INSTALL_DIR:PATH=${includedir} \
 +     -DLIB_INSTALL_DIR:PATH=${libdir} \
 +     -DLIBEXEC_INSTALL_DIR:PATH=${libexecdir} \
-+     -DSHARE_INSTALL_DIR:PATH=${datadir} \
++     -DSHARE_INSTALL_PREFIX:PATH=${datadir} \
 +     -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \
 +     -GNinja \
 +     ${srcdir}
 -- 
-2.9.3
+2.17.0