[evolution] Flatpak: Switch to 3.36 runtime and change the build order

[Milan Crha <mcrha src gnome org>]

commit d4da395183b85e57f13d8bb14b265b9db3cece64
Author: Milan Crha <mcrha redhat com>
Date:   Fri Apr 24 08:32:17 2020 +0200

    Flatpak: Switch to 3.36 runtime and change the build order
    
    The runtime switch is to get the libsecret changes 
(https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/52).
    The build order change is to not build dependencies, when only evolution-related
    code had been changed.

 flatpak/org.gnome.Evolution-master.json | 86 ++++++++++++++++-----------------
 flatpak/org.gnome.Evolution-stable.json | 86 ++++++++++++++++-----------------
 2 files changed, 86 insertions(+), 86 deletions(-)
---
diff --git a/flatpak/org.gnome.Evolution-master.json b/flatpak/org.gnome.Evolution-master.json
index 771873f193..d961471370 100644
--- a/flatpak/org.gnome.Evolution-master.json
+++ b/flatpak/org.gnome.Evolution-master.json
@@ -1,7 +1,7 @@
 {
        "app-id": "org.gnome.Evolution",
        "runtime": "org.gnome.Platform",
-       "runtime-version": "3.34",
+       "runtime-version": "3.36",
        "sdk": "org.gnome.Sdk",
        "command": "evolution",
        "rename-icon": "evolution",
@@ -193,36 +193,6 @@
                        ]
                },
 
-               {
-                       "name": "evolution-data-server",
-                       "buildsystem": "cmake-ninja",
-                       "cleanup": [ "/share/GConf" ],
-                       "config-opts": [
-                               "-DDBUS_SERVICES_PREFIX=org.gnome.Evolution",
-                               "-DENABLE_FILE_LOCKING=fcntl",
-                               "-DENABLE_DOT_LOCKING=OFF",
-                               "-DENABLE_OAUTH2=ON",
-                               "-DENABLE_GTK=ON",
-                               "-DENABLE_GOA=ON",
-                               "-DENABLE_EXAMPLES=OFF",
-                               "-DENABLE_INTROSPECTION=OFF",
-                               "-DENABLE_VALA_BINDINGS=OFF",
-                               "-DENABLE_INSTALLED_TESTS=OFF",
-                               "-DENABLE_GTK_DOC=OFF",
-                               "-DWITH_LIBDB=OFF",
-                               "-DWITH_PRIVATE_DOCS=OFF",
-                               "-DWITH_PHONENUMBER=OFF",
-                               "-DWITH_SYSTEMDUSERUNITDIR=OFF"
-                       ],
-                       "sources": [
-                               {
-                                       "type": "git",
-                                       "url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git";,
-                                       "branch": "master"
-                               }
-                       ]
-               },
-
                {
                        "name": "gspell",
                        "config-opts": [
@@ -278,6 +248,48 @@
                        ]
                },
 
+               {
+                       "name": "libmspack",
+                       "cleanup": [ "/bin" ],
+                       "sources": [
+                               {
+                                       "type": "archive",
+                                       "url": 
"https://www.cabextract.org.uk/libmspack/libmspack-0.10.1alpha.tar.gz";,
+                                       "sha256": 
"bac862dee6e0fc10d92c70212441d9f8ad9b0222edc9a708c3ead4adb1b24a8e"
+                               }
+                       ]
+               },
+
+               {
+                       "name": "evolution-data-server",
+                       "buildsystem": "cmake-ninja",
+                       "cleanup": [ "/share/GConf" ],
+                       "config-opts": [
+                               "-DDBUS_SERVICES_PREFIX=org.gnome.Evolution",
+                               "-DENABLE_FILE_LOCKING=fcntl",
+                               "-DENABLE_DOT_LOCKING=OFF",
+                               "-DENABLE_OAUTH2=ON",
+                               "-DENABLE_GTK=ON",
+                               "-DENABLE_GOA=ON",
+                               "-DENABLE_EXAMPLES=OFF",
+                               "-DENABLE_INTROSPECTION=OFF",
+                               "-DENABLE_VALA_BINDINGS=OFF",
+                               "-DENABLE_INSTALLED_TESTS=OFF",
+                               "-DENABLE_GTK_DOC=OFF",
+                               "-DWITH_LIBDB=OFF",
+                               "-DWITH_PRIVATE_DOCS=OFF",
+                               "-DWITH_PHONENUMBER=OFF",
+                               "-DWITH_SYSTEMDUSERUNITDIR=OFF"
+                       ],
+                       "sources": [
+                               {
+                                       "type": "git",
+                                       "url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git";,
+                                       "branch": "master"
+                               }
+                       ]
+               },
+
                {
                        "name": "evolution",
                        "buildsystem": "cmake-ninja",
@@ -371,18 +383,6 @@
                        ]
                },
 
-               {
-                       "name": "libmspack",
-                       "cleanup": [ "/bin" ],
-                       "sources": [
-                               {
-                                       "type": "archive",
-                                       "url": 
"https://www.cabextract.org.uk/libmspack/libmspack-0.10.1alpha.tar.gz";,
-                                       "sha256": 
"bac862dee6e0fc10d92c70212441d9f8ad9b0222edc9a708c3ead4adb1b24a8e"
-                               }
-                       ]
-               },
-
                {
                        "name": "evolution-ews",
                        "buildsystem": "cmake-ninja",
diff --git a/flatpak/org.gnome.Evolution-stable.json b/flatpak/org.gnome.Evolution-stable.json
index 5bd4783232..332abe2a1f 100644
--- a/flatpak/org.gnome.Evolution-stable.json
+++ b/flatpak/org.gnome.Evolution-stable.json
@@ -1,7 +1,7 @@
 {
        "app-id": "org.gnome.Evolution",
        "runtime": "org.gnome.Platform",
-       "runtime-version": "3.34",
+       "runtime-version": "3.36",
        "sdk": "org.gnome.Sdk",
        "command": "evolution",
        "rename-icon": "evolution",
@@ -192,36 +192,6 @@
                        ]
                },
 
-               {
-                       "name": "evolution-data-server",
-                       "buildsystem": "cmake-ninja",
-                       "cleanup": [ "/share/GConf" ],
-                       "config-opts": [
-                               "-DDBUS_SERVICES_PREFIX=org.gnome.Evolution",
-                               "-DENABLE_FILE_LOCKING=fcntl",
-                               "-DENABLE_DOT_LOCKING=OFF",
-                               "-DENABLE_OAUTH2=ON",
-                               "-DENABLE_GTK=ON",
-                               "-DENABLE_GOA=ON",
-                               "-DENABLE_EXAMPLES=OFF",
-                               "-DENABLE_INTROSPECTION=OFF",
-                               "-DENABLE_VALA_BINDINGS=OFF",
-                               "-DENABLE_INSTALLED_TESTS=OFF",
-                               "-DENABLE_GTK_DOC=OFF",
-                               "-DWITH_LIBDB=OFF",
-                               "-DWITH_PRIVATE_DOCS=OFF",
-                               "-DWITH_PHONENUMBER=OFF",
-                               "-DWITH_SYSTEMDUSERUNITDIR=OFF"
-                       ],
-                       "sources": [
-                               {
-                                       "type": "git",
-                                       "url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git";,
-                                       "branch": "gnome-3-36"
-                               }
-                       ]
-               },
-
                {
                        "name": "gspell",
                        "config-opts": [
@@ -277,6 +247,48 @@
                        ]
                },
 
+               {
+                       "name": "libmspack",
+                       "cleanup": [ "/bin" ],
+                       "sources": [
+                               {
+                                       "type": "archive",
+                                       "url": 
"https://www.cabextract.org.uk/libmspack/libmspack-0.10.1alpha.tar.gz";,
+                                       "sha256": 
"bac862dee6e0fc10d92c70212441d9f8ad9b0222edc9a708c3ead4adb1b24a8e"
+                               }
+                       ]
+               },
+
+               {
+                       "name": "evolution-data-server",
+                       "buildsystem": "cmake-ninja",
+                       "cleanup": [ "/share/GConf" ],
+                       "config-opts": [
+                               "-DDBUS_SERVICES_PREFIX=org.gnome.Evolution",
+                               "-DENABLE_FILE_LOCKING=fcntl",
+                               "-DENABLE_DOT_LOCKING=OFF",
+                               "-DENABLE_OAUTH2=ON",
+                               "-DENABLE_GTK=ON",
+                               "-DENABLE_GOA=ON",
+                               "-DENABLE_EXAMPLES=OFF",
+                               "-DENABLE_INTROSPECTION=OFF",
+                               "-DENABLE_VALA_BINDINGS=OFF",
+                               "-DENABLE_INSTALLED_TESTS=OFF",
+                               "-DENABLE_GTK_DOC=OFF",
+                               "-DWITH_LIBDB=OFF",
+                               "-DWITH_PRIVATE_DOCS=OFF",
+                               "-DWITH_PHONENUMBER=OFF",
+                               "-DWITH_SYSTEMDUSERUNITDIR=OFF"
+                       ],
+                       "sources": [
+                               {
+                                       "type": "git",
+                                       "url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git";,
+                                       "branch": "gnome-3-36"
+                               }
+                       ]
+               },
+
                {
                        "name": "evolution",
                        "buildsystem": "cmake-ninja",
@@ -370,18 +382,6 @@
                        ]
                },
 
-               {
-                       "name": "libmspack",
-                       "cleanup": [ "/bin" ],
-                       "sources": [
-                               {
-                                       "type": "archive",
-                                       "url": 
"https://www.cabextract.org.uk/libmspack/libmspack-0.10.1alpha.tar.gz";,
-                                       "sha256": 
"bac862dee6e0fc10d92c70212441d9f8ad9b0222edc9a708c3ead4adb1b24a8e"
-                               }
-                       ]
-               },
-
                {
                        "name": "evolution-ews",
                        "buildsystem": "cmake-ninja",