[evolution] Update Flatpak manifests

[Milan Crha <mcrha src gnome org>]

commit cbee52a172b3e80f9c8292613b0e697a82a2ead7
Author: Milan Crha <mcrha redhat com>
Date:   Mon Oct 1 14:46:37 2018 +0200

    Update Flatpak manifests
    
    Changes made similar to those suggested in:
    https://github.com/flathub/flathub/pull/616/

 flatpak/org.gnome.Evolution-master.json | 24 +++++++++++-------------
 flatpak/org.gnome.Evolution-stable.json | 23 +++++++++++------------
 2 files changed, 22 insertions(+), 25 deletions(-)
---
diff --git a/flatpak/org.gnome.Evolution-master.json b/flatpak/org.gnome.Evolution-master.json
index 159c73402e..999f4d4f61 100644
--- a/flatpak/org.gnome.Evolution-master.json
+++ b/flatpak/org.gnome.Evolution-master.json
@@ -28,7 +28,6 @@
                "--socket=wayland",
                "--socket=pulseaudio",
                "--talk-name=org.freedesktop.Notifications",
-               "--talk-name=org.freedesktop.portal.Desktop",
                "--talk-name=org.gnome.OnlineAccounts"
        ],
        "modules": [
@@ -37,7 +36,6 @@
                        "cleanup": [ "/lib/cmake" ],
                        "buildsystem": "cmake-ninja",
                        "config-opts": [
-                               "-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib",
                                "-DBUILD_SHARED_LIBS:BOOL=ON",
                                "-DGOBJECT_INTROSPECTION:BOOL=OFF"
                        ],
@@ -65,7 +63,12 @@
 
                {
                        "name": "gnome-online-accounts",
-                       "config-opts": [ "--disable-Werror", "--disable-telepathy", 
"--disable-documentation", "--disable-backend" ],
+                       "config-opts": [
+                               "--disable-Werror",
+                               "--disable-telepathy",
+                               "--disable-documentation",
+                               "--disable-backend"
+                       ],
                        "cleanup": [ "/bin", "/share/GConf" ],
                        "sources": [
                                {
@@ -110,27 +113,23 @@
                        "sources": [
                                {
                                        "type": "archive",
-                                       "url": 
"https://download.gnome.org/sources/geocode-glib/3.24/geocode-glib-3.24.0.tar.xz";,
-                                       "sha256": 
"19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e"
+                                       "url": 
"https://download.gnome.org/sources/geocode-glib/3.26/geocode-glib-3.26.0.tar.xz";,
+                                       "sha256": 
"ea4086b127050250c158beff28dbcdf81a797b3938bb79bbaaecc75e746fbeee"
                                }
                        ]
                },
 
                {
                        "name": "libgweather",
-                       "config-opts": [
-                               "--disable-glade-catalog",
-                               "--disable-introspection",
-                               "--disable-vala"
-                       ],
+                       "buildsystem": "meson",
                        "cleanup": [
                                "/share/gtk-doc"
                        ],
                        "sources": [
                                {
                                        "type": "archive",
-                                       "url": 
"https://download.gnome.org/sources/libgweather/3.24/libgweather-3.24.1.tar.xz";,
-                                       "sha256": 
"1227316037b63dac4153031a22abccb3d2ac679a7409e29cd303eec499eb653c"
+                                       "url": 
"https://download.gnome.org/sources/libgweather/3.28/libgweather-3.28.2.tar.xz";,
+                                       "sha256": 
"081ce81653afc614e12641c97a8dd9577c524528c63772407ae2dbcde12bde75"
                                }
                        ]
                },
@@ -230,7 +229,6 @@
                                "-DENABLE_DOT_LOCKING=OFF",
                                "-DENABLE_OAUTH2=ON",
                                "-DENABLE_GTK=ON",
-                               "-DENABLE_UOA=OFF",
                                "-DENABLE_GOA=ON",
                                "-DENABLE_EXAMPLES=OFF",
                                "-DENABLE_INTROSPECTION=OFF",
diff --git a/flatpak/org.gnome.Evolution-stable.json b/flatpak/org.gnome.Evolution-stable.json
index 7e86ab3a75..920660f2a6 100644
--- a/flatpak/org.gnome.Evolution-stable.json
+++ b/flatpak/org.gnome.Evolution-stable.json
@@ -27,7 +27,6 @@
                "--socket=wayland",
                "--socket=pulseaudio",
                "--talk-name=org.freedesktop.Notifications",
-               "--talk-name=org.freedesktop.portal.Desktop",
                "--talk-name=org.gnome.OnlineAccounts"
        ],
        "modules": [
@@ -36,7 +35,6 @@
                        "cleanup": [ "/lib/cmake" ],
                        "buildsystem": "cmake-ninja",
                        "config-opts": [
-                               "-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib",
                                "-DBUILD_SHARED_LIBS:BOOL=ON",
                                "-DGOBJECT_INTROSPECTION:BOOL=OFF"
                        ],
@@ -64,7 +62,12 @@
 
                {
                        "name": "gnome-online-accounts",
-                       "config-opts": [ "--disable-Werror", "--disable-telepathy", 
"--disable-documentation", "--disable-backend" ],
+                       "config-opts": [
+                               "--disable-Werror",
+                               "--disable-telepathy",
+                               "--disable-documentation",
+                               "--disable-backend"
+                       ],
                        "cleanup": [ "/bin", "/share/GConf" ],
                        "sources": [
                                {
@@ -109,27 +112,23 @@
                        "sources": [
                                {
                                        "type": "archive",
-                                       "url": 
"https://download.gnome.org/sources/geocode-glib/3.24/geocode-glib-3.24.0.tar.xz";,
-                                       "sha256": 
"19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e"
+                                       "url": 
"https://download.gnome.org/sources/geocode-glib/3.26/geocode-glib-3.26.0.tar.xz";,
+                                       "sha256": 
"ea4086b127050250c158beff28dbcdf81a797b3938bb79bbaaecc75e746fbeee"
                                }
                        ]
                },
 
                {
                        "name": "libgweather",
-                       "config-opts": [
-                               "--disable-glade-catalog",
-                               "--disable-introspection",
-                               "--disable-vala"
-                       ],
+                       "buildsystem": "meson",
                        "cleanup": [
                                "/share/gtk-doc"
                        ],
                        "sources": [
                                {
                                        "type": "archive",
-                                       "url": 
"https://download.gnome.org/sources/libgweather/3.24/libgweather-3.24.1.tar.xz";,
-                                       "sha256": 
"1227316037b63dac4153031a22abccb3d2ac679a7409e29cd303eec499eb653c"
+                                       "url": 
"https://download.gnome.org/sources/libgweather/3.28/libgweather-3.28.2.tar.xz";,
+                                       "sha256": 
"081ce81653afc614e12641c97a8dd9577c524528c63772407ae2dbcde12bde75"
                                }
                        ]
                },