diff --git a/rust-bindings/Makefile b/rust-bindings/Makefile index a49ab80e..652d7e46 100644 --- a/rust-bindings/Makefile +++ b/rust-bindings/Makefile @@ -1,5 +1,5 @@ GIR_REPO := https://github.com/gtk-rs/gir.git -GIR_VERSION := e94fdc6499e45d89bada123f4d2e63ceb6af997d +GIR_VERSION := 0eeebbdf9d4d5a0b0148c7fa055bf961e16e54a0 OSTREE_REPO := ../ostree OSTREE_VERSION := patch-v2022.2 RUSTDOC_STRIPPER_VERSION := 0.1.17 diff --git a/rust-bindings/src/auto/flags.rs b/rust-bindings/src/auto/flags.rs index 65dd92d0..7f822000 100644 --- a/rust-bindings/src/auto/flags.rs +++ b/rust-bindings/src/auto/flags.rs @@ -590,6 +590,13 @@ impl ToValue for SysrootUpgraderFlags { } } +impl From for glib::Value { + #[inline] + fn from(v: SysrootUpgraderFlags) -> Self { + ToValue::to_value(&v) + } +} + bitflags! { #[doc(alias = "OstreeSysrootUpgraderPullFlags")] pub struct SysrootUpgraderPullFlags: u32 { diff --git a/rust-bindings/src/auto/repo_finder_result.rs b/rust-bindings/src/auto/repo_finder_result.rs index b4846b5e..4908673e 100644 --- a/rust-bindings/src/auto/repo_finder_result.rs +++ b/rust-bindings/src/auto/repo_finder_result.rs @@ -2,8 +2,8 @@ // from gir-files // DO NOT EDIT -use std::cmp; use glib::translate::*; +use std::cmp; glib::wrapper! { #[derive(Debug, Hash)] diff --git a/rust-bindings/src/auto/sysroot.rs b/rust-bindings/src/auto/sysroot.rs index 54dcdc42..abb80387 100644 --- a/rust-bindings/src/auto/sysroot.rs +++ b/rust-bindings/src/auto/sysroot.rs @@ -273,6 +273,18 @@ impl Sysroot { } } + #[cfg(any(feature = "v2022_7", feature = "dox"))] + #[cfg_attr(feature = "dox", doc(cfg(feature = "v2022_7")))] + #[doc(alias = "ostree_sysroot_initialize_with_mount_namespace")] + pub fn initialize_with_mount_namespace(&self, cancellable: Option<&impl IsA>) -> Result<(), glib::Error> { + unsafe { + let mut error = ptr::null_mut(); + let is_ok = ffi::ostree_sysroot_initialize_with_mount_namespace(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error); + assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null()); + if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } + } + } + #[cfg(any(feature = "v2020_1", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))] #[doc(alias = "ostree_sysroot_is_booted")] diff --git a/rust-bindings/src/auto/versions.txt b/rust-bindings/src/auto/versions.txt index 23200b1b..97f80dcd 100644 --- a/rust-bindings/src/auto/versions.txt +++ b/rust-bindings/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) -from gir-files (@ 0dbd87c01724) +Generated by gir (https://github.com/gtk-rs/gir @ 0eeebbdf9d4d) +from gir-files (@ 8c831311be59) diff --git a/rust-bindings/sys/Cargo.toml b/rust-bindings/sys/Cargo.toml index c855052d..543f515d 100644 --- a/rust-bindings/sys/Cargo.toml +++ b/rust-bindings/sys/Cargo.toml @@ -67,6 +67,7 @@ v2021_5 = ["v2021_4"] v2022_2 = ["v2021_5"] v2022_5 = ["v2022_2"] v2022_6 = ["v2022_5"] +v2022_7 = ["v2022_5"] [lib] name = "ostree_sys" @@ -224,3 +225,6 @@ version = "2022.5" [package.metadata.system-deps.ostree_1.v2022_6] version = "2022.6" + +[package.metadata.system-deps.ostree_1.v2022_7] +version = "2022.7" diff --git a/rust-bindings/sys/src/auto/versions.txt b/rust-bindings/sys/src/auto/versions.txt index 23200b1b..97f80dcd 100644 --- a/rust-bindings/sys/src/auto/versions.txt +++ b/rust-bindings/sys/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) -from gir-files (@ 0dbd87c01724) +Generated by gir (https://github.com/gtk-rs/gir @ 0eeebbdf9d4d) +from gir-files (@ 8c831311be59) diff --git a/rust-bindings/sys/src/lib.rs b/rust-bindings/sys/src/lib.rs index 75bcae8d..f71a18de 100644 --- a/rust-bindings/sys/src/lib.rs +++ b/rust-bindings/sys/src/lib.rs @@ -1312,19 +1312,6 @@ extern "C" { #[cfg(any(feature = "v2022_5", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v2022_5")))] pub fn ostree_kernel_args_append_if_missing(kargs: *mut OstreeKernelArgs, arg: *const c_char); - #[cfg(any(feature = "v2022_7", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2022_7")))] - pub fn ostree_kernel_args_contains( - kargs: *mut OstreeKernelArgs, - arg: *const c_char, - ) -> gboolean; - #[cfg(any(feature = "v2022_7", feature = "dox"))] - #[cfg_attr(feature = "dox", doc(cfg(feature = "v2022_7")))] - pub fn ostree_kernel_args_delete_if_present( - kargs: *mut OstreeKernelArgs, - arg: *const c_char, - error: *mut *mut glib::GError, - ) -> gboolean; #[cfg(any(feature = "v2019_3", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))] pub fn ostree_kernel_args_append_proc_cmdline( @@ -1332,11 +1319,24 @@ extern "C" { cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError, ) -> gboolean; + #[cfg(any(feature = "v2022_7", feature = "dox"))] + #[cfg_attr(feature = "dox", doc(cfg(feature = "v2022_7")))] + pub fn ostree_kernel_args_contains( + kargs: *mut OstreeKernelArgs, + arg: *const c_char, + ) -> gboolean; pub fn ostree_kernel_args_delete( kargs: *mut OstreeKernelArgs, arg: *const c_char, error: *mut *mut glib::GError, ) -> gboolean; + #[cfg(any(feature = "v2022_7", feature = "dox"))] + #[cfg_attr(feature = "dox", doc(cfg(feature = "v2022_7")))] + pub fn ostree_kernel_args_delete_if_present( + kargs: *mut OstreeKernelArgs, + arg: *const c_char, + error: *mut *mut glib::GError, + ) -> gboolean; #[cfg(any(feature = "v2019_3", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))] pub fn ostree_kernel_args_delete_key_entry( @@ -3218,6 +3218,13 @@ extern "C" { self_: *mut OstreeSysroot, error: *mut *mut glib::GError, ) -> gboolean; + #[cfg(any(feature = "v2022_7", feature = "dox"))] + #[cfg_attr(feature = "dox", doc(cfg(feature = "v2022_7")))] + pub fn ostree_sysroot_initialize_with_mount_namespace( + self_: *mut OstreeSysroot, + cancellable: *mut gio::GCancellable, + error: *mut *mut glib::GError, + ) -> gboolean; #[cfg(any(feature = "v2020_1", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))] pub fn ostree_sysroot_is_booted(self_: *mut OstreeSysroot) -> gboolean;