From 895babbe82e2c55cb554a24b78cdb17deec72e54 Mon Sep 17 00:00:00 2001
From: Sophie Herold <sophie@hemio.de>
Date: Wed, 17 Jul 2024 13:26:01 +0200
Subject: [PATCH] meson: Require libadwaita 1.6 for new spinner

---
 Cargo.toml  |  2 +-
 meson.build | 31 +++++++++++++++++++------------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e0a541a..15c7798 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ codegen-units = 1
 x11 = ["ashpd/gtk4_x11"]
 
 [dependencies]
-adw = { package = "libadwaita", version = "0.7.0", features = ["v1_5"] }
+adw = { package = "libadwaita", version = "0.7.0", features = ["v1_6"] }
 anyhow = { version = "1.0.66", features = ["backtrace"] }
 arc-swap = "1.6.0"
 ashpd = { version = "0.9.1", features = ["gtk4_wayland"] }
diff --git a/meson.build b/meson.build
index 19ce1ba..342c278 100644
--- a/meson.build
+++ b/meson.build
@@ -1,15 +1,18 @@
-project('loupe', 'rust',
-          version: '47.alpha',
-    meson_version: '>= 0.59.0',
-  default_options: [ 'warning_level=2',
-                   ],
+project(
+  'loupe',
+  'rust',
+  version: '47.alpha',
+  meson_version: '>= 0.59.0',
+  default_options: [
+    'warning_level=2',
+  ],
 )
 
 i18n = import('i18n')
 gnome = import('gnome')
 
 dependency('gtk4', version: '>=4.13.6')
-dependency('libadwaita-1', version: '>=1.5.beta')
+dependency('libadwaita-1', version: '>=1.6.alpha')
 dependency('gweather4', version: '>=4.0.0')
 # Required by glycin crate
 dependency('lcms2', version: '>=2.12.0')
@@ -45,8 +48,8 @@ app_id = 'org.gnome.Loupe@0@'.format(profile)
 iv_version = meson.project_version() + version_suffix
 
 cargo_sources = files(
-  'Cargo.toml',
   'Cargo.lock',
+  'Cargo.toml',
 )
 
 conf = configuration_data()
@@ -65,8 +68,8 @@ subdir('po')
 
 # Pre-commit hook for rust formatting
 if get_option('profile') == 'development'
-    message('Setting up git pre-commit hook..')
-    run_command('cp', '-f', 'hooks/pre-commit.hook', '.git/hooks/pre-commit', check: false)
+  message('Setting up git pre-commit hook..')
+  run_command('cp', '-f', 'hooks/pre-commit.hook', '.git/hooks/pre-commit', check: false)
 endif
 
 gnome.post_install(
@@ -77,6 +80,10 @@ gnome.post_install(
 
 meson.add_dist_script(
   'build-aux/meson/dist-vendor.sh',
-  join_paths(meson.project_build_root(), 'meson-dist', meson.project_name() + '-' + meson.project_version()),
-  meson.project_source_root()
-)
+  join_paths(
+    meson.project_build_root(),
+    'meson-dist',
+    meson.project_name() + '-' + meson.project_version(),
+  ),
+  meson.project_source_root(),
+)
\ No newline at end of file