[gnome-clocks] Update dependencies for GTK4 and libadwaita

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit 6940e32528e3075041a01711451bd15ee886481b
Author: Yetizone <andreii lisita gmail com>
Date:   Sun Jan 3 18:10:31 2021 +0200

    Update dependencies for GTK4 and libadwaita

 build-aux/flatpak/org.gnome.clocks.json |  7 +++---
 meson.build                             | 42 ++++++++++++++++-----------------
 src/meson.build                         |  2 +-
 3 files changed, 26 insertions(+), 25 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.clocks.json b/build-aux/flatpak/org.gnome.clocks.json
index 3525e74e..43371ed6 100644
--- a/build-aux/flatpak/org.gnome.clocks.json
+++ b/build-aux/flatpak/org.gnome.clocks.json
@@ -44,8 +44,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/libgweather.git";,
-                    "tag": "40.0"
+                    "url": "https://gitlab.gnome.org/mlundblad/libgweather.git";,
+                    "branch": "wip/mlundblad/no-gtk"
                 }
             ]
         },
@@ -61,7 +61,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gnome-desktop.git";
+                    "url": "https://gitlab.gnome.org/GNOME/gnome-desktop.git";,
+                    "branch": "wip/gtk4"
                 }
             ]
         },
diff --git a/meson.build b/meson.build
index ffd2d692..2c738e67 100644
--- a/meson.build
+++ b/meson.build
@@ -13,33 +13,33 @@ python3 = import('python3')
 glib = dependency('glib-2.0', version: '>= 2.68')
 gio = dependency('gio-2.0', version: '>= 2.58')
 gobject = dependency('gobject-2.0', version: '>= 2.58')
-gtk = dependency('gtk+-3.0', version: '>=3.20')
+gtk = dependency('gtk4')
 gsound = dependency('gsound', version: '>=0.98')
-gweather = dependency('gweather-3.0', version: '>=3.32.0')
-gnomedesktop = dependency('gnome-desktop-3.0', version: '>=3.8')
+gweather = dependency('gweather-4.0')
+gnomedesktop = dependency('gnome-desktop-4.0')
 geocodeglib = dependency('geocode-glib-1.0', version: '>=1.0')
 libgeoclue = dependency('libgeoclue-2.0', version: '>=2.4')
-libhandy = dependency ('libhandy-1', version: '>= 1.0.0', required: false)
+libadwaita = dependency ('libadwaita-1', version: '>=1.0')
 
-libhandy_subproj = libhandy
-if not libhandy.found()
-  libhandy_subproj = subproject(
-    'libhandy',
-    default_options: [
-      'examples=false',
-      'glade_catalog=disabled',
-      'tests=false',
-    ]
-  )
+# libhandy_subproj = libhandy
+# if not libhandy.found()
+#   libhandy_subproj = subproject(
+#     'libhandy',
+#     default_options: [
+#       'examples=false',
+#       'glade_catalog=disabled',
+#       'tests=false',
+#     ]
+#   )
 
   # When using libhandy as subproject, make sure we get the VAPI file
-  libhandy = declare_dependency(
-    dependencies: [
-      libhandy_subproj.get_variable('libhandy_dep'),
-      libhandy_subproj.get_variable('libhandy_vapi'),
-    ]
-  )
-endif
+#   libhandy = declare_dependency(
+#     dependencies: [
+#       libhandy_subproj.get_variable('libhandy_dep'),
+#       libhandy_subproj.get_variable('libhandy_vapi'),
+#     ]
+#   )
+# endif
 
 cc = meson.get_compiler('c')
 math = cc.find_library('m', required: false)
diff --git a/src/meson.build b/src/meson.build
index 4c51188f..fb3397e2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -71,7 +71,7 @@ clocks_dependencies = [
   gnomedesktop,
   geocodeglib,
   libgeoclue,
-  libhandy,
+  libadwaita,
   math
 ]