From da2bf2d1a004e5487f73aa80409131294d8a1842 Mon Sep 17 00:00:00 2001 From: psykose Date: Wed, 13 Nov 2024 22:55:10 +0100 Subject: [PATCH] fix gsettings compile in devenv --- Cargo.lock | 34 ++++++++++++++++++++++++++-------- data/meson.build | 1 + meson.build | 5 +---- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 150e953..9d48736 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -820,8 +820,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -1938,9 +1940,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" dependencies = [ "bytes", "pin-project-lite", @@ -1956,19 +1958,22 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", + "getrandom", "rand", "ring", "rustc-hash 2.0.0", "rustls", + "rustls-pki-types", "slab", "thiserror", "tinyvec", "tracing", + "web-time", ] [[package]] @@ -2189,6 +2194,9 @@ name = "rustls-pki-types" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +dependencies = [ + "web-time", +] [[package]] name = "rustls-webpki" @@ -2443,18 +2451,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.69" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.69" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" dependencies = [ "proc-macro2", "quote", @@ -2801,6 +2809,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "webpki-roots" version = "0.26.6" diff --git a/data/meson.build b/data/meson.build index 5c5b81e..d9a0e7e 100644 --- a/data/meson.build +++ b/data/meson.build @@ -31,6 +31,7 @@ install_data( 'eu.callcc.audrey.gschema.xml', install_dir: get_option('datadir') / 'glib-2.0' / 'schemas', ) +gnome.compile_schemas() compile_schemas = find_program( 'glib-compile-schemas', diff --git a/meson.build b/meson.build index 70d92fd..dda816e 100644 --- a/meson.build +++ b/meson.build @@ -6,9 +6,8 @@ project( default_options: ['warning_level=0', 'werror=false'], ) -i18n = import('i18n') gnome = import('gnome') -fs = import('fs') +i18n = import('i18n') cc = meson.get_compiler('c') srcdir = meson.project_source_root() / 'src' @@ -19,8 +18,6 @@ config_h.set_quoted('GETTEXT_PACKAGE', 'audrey') config_h.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir')) configure_file(output: 'config.h', configuration: config_h) -config_inc = include_directories('.') - add_project_arguments( [ '-DGETTEXT_PACKAGE="' + meson.project_name() + '"',