[geary/mjog/fix-ci-post-libcanberra-removal-3-36: 1/3] org.gnome.Geary.yaml: Remove unused EDS config opts, sort remaining

[Michael Gratton <mjog src gnome org>]

commit 0c62580800750a4578dd8c021c226aa859bd6871
Author: Michael Gratton <mike vee net>
Date:   Fri Apr 3 10:02:07 2020 +1100

    org.gnome.Geary.yaml: Remove unused EDS config opts, sort remaining

 org.gnome.Geary.json | 15 ++++++---------
 org.gnome.Geary.yaml | 15 ++++++---------
 2 files changed, 12 insertions(+), 18 deletions(-)
---
diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index 8a81169d..36d20e6a 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -116,20 +116,17 @@
             "buildsystem": "cmake-ninja",
             "config-opts": [
                 "-DCMAKE_BUILD_TYPE=Release",
-                "-DENABLE_GTK=ON",
+                "-DENABLE_EXAMPLES=OFF",
                 "-DENABLE_GOA=ON",
-                "-DENABLE_UOA=OFF",
-                "-DENABLE_GOOGLE_AUTH=OFF",
                 "-DENABLE_GOOGLE=OFF",
-                "-DENABLE_WITH_PHONENUMBER=OFF",
+                "-DENABLE_GTK=ON",
+                "-DENABLE_GTK_DOC=OFF",
+                "-DENABLE_INSTALLED_TESTS=OFF",
+                "-DENABLE_INTROSPECTION=ON",
                 "-DENABLE_VALA_BINDINGS=ON",
                 "-DENABLE_WEATHER=OFF",
-                "-DWITH_OPENLDAP=OFF",
                 "-DWITH_LIBDB=OFF",
-                "-DENABLE_INTROSPECTION=ON",
-                "-DENABLE_INSTALLED_TESTS=OFF",
-                "-DENABLE_GTK_DOC=OFF",
-                "-DENABLE_EXAMPLES=OFF"
+                "-DWITH_OPENLDAP=OFF"
             ],
             "sources": [
                 {
diff --git a/org.gnome.Geary.yaml b/org.gnome.Geary.yaml
index 3ce16728..b11646f6 100644
--- a/org.gnome.Geary.yaml
+++ b/org.gnome.Geary.yaml
@@ -134,20 +134,17 @@ modules:
     buildsystem: cmake-ninja
     config-opts:
       - "-DCMAKE_BUILD_TYPE=Release"
-      - "-DENABLE_GTK=ON"
+      - "-DENABLE_EXAMPLES=OFF"
       - "-DENABLE_GOA=ON"
-      - "-DENABLE_UOA=OFF"
-      - "-DENABLE_GOOGLE_AUTH=OFF"
       - "-DENABLE_GOOGLE=OFF"
-      - "-DENABLE_WITH_PHONENUMBER=OFF"
+      - "-DENABLE_GTK=ON"
+      - "-DENABLE_GTK_DOC=OFF"
+      - "-DENABLE_INSTALLED_TESTS=OFF"
+      - "-DENABLE_INTROSPECTION=ON"
       - "-DENABLE_VALA_BINDINGS=ON"
       - "-DENABLE_WEATHER=OFF"
-      - "-DWITH_OPENLDAP=OFF"
       - "-DWITH_LIBDB=OFF"
-      - "-DENABLE_INTROSPECTION=ON"
-      - "-DENABLE_INSTALLED_TESTS=OFF"
-      - "-DENABLE_GTK_DOC=OFF"
-      - "-DENABLE_EXAMPLES=OFF"
+      - "-DWITH_OPENLDAP=OFF"
     sources:
       - type: git
         url: https://gitlab.gnome.org/GNOME/evolution-data-server.git