[gnome-software: 1/110] build: Switch to GTK4 and libadwaita

[Philip Withnall <pwithnall src gnome org>]

commit c31b8e0112b0e7de5eb5570532c165fc802f6e45
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Sat Aug 21 12:31:58 2021 -0300

    build: Switch to GTK4 and libadwaita
    
    Bump the meson dependencies correspondingly, and add the libadwaita
    dependency to the Flatpak manifest as well.

 .gitignore                           |  2 +-
 contrib/org.gnome.SoftwareDevel.json |  2 +-
 lib/tools/meson.build                |  2 +-
 meson.build                          | 10 ++++------
 src/meson.build                      |  2 +-
 subprojects/libadwaita.wrap          |  5 +++++
 subprojects/libhandy.wrap            |  5 -----
 7 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ee9c05312..43222ec27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 subprojects/appstream/
+subprojects/libadwaita/
 subprojects/libglib-testing/
-subprojects/libhandy/
 subprojects/libxmlb/
 subprojects/malcontent/
 subprojects/sysprof/
diff --git a/contrib/org.gnome.SoftwareDevel.json b/contrib/org.gnome.SoftwareDevel.json
index 8f4916f99..ad43b3f0d 100644
--- a/contrib/org.gnome.SoftwareDevel.json
+++ b/contrib/org.gnome.SoftwareDevel.json
@@ -200,4 +200,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/lib/tools/meson.build b/lib/tools/meson.build
index 0f19c10c1..68447757e 100644
--- a/lib/tools/meson.build
+++ b/lib/tools/meson.build
@@ -12,7 +12,7 @@ executable(
   ],
   dependencies : [
     glib,
-    dependency('gdk-3.0'),
+    gtk,
     gdk_pixbuf,
     libm,
   ],
diff --git a/meson.build b/meson.build
index 3e6453cf0..22b65ffe8 100644
--- a/meson.build
+++ b/meson.build
@@ -125,19 +125,17 @@ gdk_pixbuf = dependency('gdk-pixbuf-2.0', version : '>= 2.32.0')
 libxmlb = dependency('xmlb', version : '>= 0.1.7', fallback : ['libxmlb', 'libxmlb_dep'])
 gio_unix = dependency('gio-unix-2.0', version : '>= 2.56.0')
 gmodule = dependency('gmodule-2.0')
-gtk = dependency('gtk+-3.0', version : '>= 3.22.4')
+gtk = dependency('gtk4', version : '>= 4.2')
 glib = dependency('glib-2.0', version : '>= 2.55.0')
 json_glib = dependency('json-glib-1.0', version : '>= 1.2.0')
 libm = cc.find_library('m', required: false)
 libsoup = dependency('libsoup-2.4', version : '>= 2.52.0')
-libhandy = dependency('libhandy-1',
-  version: '>=1.2.0',
-  fallback: ['libhandy', 'libhandy_dep'],
+libadwaita = dependency('libadwaita-1',
+  version: '>=1.0.0-alpha.2',
+  fallback: ['libadwaita', 'libadwaita_dep'],
   default_options: [
       'examples=false',
-      'glade_catalog=disabled',
       'introspection=disabled',
-      'static=true',
       'tests=false',
       'vapi=false',
     ]
diff --git a/src/meson.build b/src/meson.build
index fd22d07fd..3044342b4 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -99,7 +99,7 @@ gnome_software_dependencies = [
   gtk,
   json_glib,
   libgnomesoftware_dep,
-  libhandy,
+  libadwaita,
   libm,
   libsoup,
   libxmlb,
diff --git a/subprojects/libadwaita.wrap b/subprojects/libadwaita.wrap
new file mode 100644
index 000000000..6cb78a5b8
--- /dev/null
+++ b/subprojects/libadwaita.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+directory=libadwaita
+url=https://gitlab.gnome.org/GNOME/libadwaita.git
+revision=1.0.0-alpha.2
+depth=1