lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

meson: Require libadwaita 1.6 for new spinner

Browse source
This commit is contained in:
Sophie Herold 2024-07-17 13:26:01 +02:00
parent cd68778890
commit 895babbe82
2 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -13,7 +13,7 @@ codegen-units = 1
x11 = ["ashpd/gtk4_x11"] x11 = ["ashpd/gtk4_x11"]
[dependencies] [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"] } anyhow = { version = "1.0.66", features = ["backtrace"] }
arc-swap = "1.6.0" arc-swap = "1.6.0"
ashpd = { version = "0.9.1", features = ["gtk4_wayland"] } ashpd = { version = "0.9.1", features = ["gtk4_wayland"] }

29
meson.build
View file

@ -1,15 +1,18 @@
project('loupe', 'rust', project(
version: '47.alpha', 'loupe',
meson_version: '>= 0.59.0', 'rust',
default_options: [ 'warning_level=2', version: '47.alpha',
], meson_version: '>= 0.59.0',
default_options: [
'warning_level=2',
],
) )
i18n = import('i18n') i18n = import('i18n')
gnome = import('gnome') gnome = import('gnome')
dependency('gtk4', version: '>=4.13.6') 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') dependency('gweather4', version: '>=4.0.0')
# Required by glycin crate # Required by glycin crate
dependency('lcms2', version: '>=2.12.0') 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 iv_version = meson.project_version() + version_suffix
cargo_sources = files( cargo_sources = files(
'Cargo.toml',
'Cargo.lock', 'Cargo.lock',
'Cargo.toml',
) )
conf = configuration_data() conf = configuration_data()
@ -65,8 +68,8 @@ subdir('po')
# Pre-commit hook for rust formatting # Pre-commit hook for rust formatting
if get_option('profile') == 'development' if get_option('profile') == 'development'
message('Setting up git pre-commit hook..') message('Setting up git pre-commit hook..')
run_command('cp', '-f', 'hooks/pre-commit.hook', '.git/hooks/pre-commit', check: false) run_command('cp', '-f', 'hooks/pre-commit.hook', '.git/hooks/pre-commit', check: false)
endif endif
gnome.post_install( gnome.post_install(
@ -77,6 +80,10 @@ gnome.post_install(
meson.add_dist_script( meson.add_dist_script(
'build-aux/meson/dist-vendor.sh', 'build-aux/meson/dist-vendor.sh',
join_paths(meson.project_build_root(), 'meson-dist', meson.project_name() + '-' + meson.project_version()), join_paths(
meson.project_source_root() meson.project_build_root(),
'meson-dist',
meson.project_name() + '-' + meson.project_version(),
),
meson.project_source_root(),
) )