[gnome-maps/wip/mlundblad/migrate-to-gweather4: 2/3] Migrate to libgweather4

[Marcus Lundblad <mlundblad src gnome org>]

commit 7075655c4f02f9dd864b7d3d45f99c8f8ac44d41
Author: Marcus Lundblad <ml dfupdate se>
Date:   Mon Apr 4 23:48:01 2022 +0200

    Migrate to libgweather4
    
    - Upgrade GI package requirement to
      use libgweather 4.
    - Build e-d-s in Flatpak manifest without
      libgweather support.

 org.gnome.Maps.json | 10 ++++++----
 src/main.js         |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/org.gnome.Maps.json b/org.gnome.Maps.json
index d8c18db0..7f0b0fbc 100644
--- a/org.gnome.Maps.json
+++ b/org.gnome.Maps.json
@@ -104,15 +104,16 @@
         },
         {
             "name" : "libgweather",
-            "buildsystem" : "meson",
             "config-opts" : [
-                "--libdir=/app/lib"
+                "-Denable_vala=false",
+                "-Dgtk_doc=false"
             ],
+            "buildsystem" : "meson",
             "sources" : [
                 {
                     "type" : "git",
                     "url" : "https://gitlab.gnome.org/GNOME/libgweather.git";,
-                    "tag" : "40.0"
+                    "branch" : "main"
                 }
             ]
         },
@@ -149,7 +150,8 @@
                 "-DENABLE_EXAMPLES=OFF",
                 "-DENABLE_VALA_BINDINGS=ON",
                 "-DENABLE_INTROSPECTION=ON",
-                "-DENABLE_CANBERRA=OFF"
+                "-DENABLE_CANBERRA=OFF",
+                "-DENABLE_WEATHER=OFF"
             ],
             "buildsystem" : "cmake-ninja",
             "sources" : [
diff --git a/src/main.js b/src/main.js
index e57e45fc..523f659b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -36,7 +36,7 @@ pkg.require({ 'cairo': '1.0',
               'Gtk': '3.0',
               'GtkChamplain': '0.12',
               'GtkClutter': '1.0',
-              'GWeather': '3.0',
+              'GWeather': '4.0',
               'Handy': '1',
               'Rest': '0.7',
               'Soup': '2.4',