Merge pull request #3378 from cgwalters/update-gir-follow

Update gir followup
ostreedev · Feb 3, 2025 · 6b4e79c · 6b4e79c
2 parents 968b0b1 + 1583090
commit 6b4e79c
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 10 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,8 +37,8 @@ members = [".", "rust-bindings/sys"]
 base64 = "0.20.0"
 bitflags = "1.2.1"
 ffi = { package = "ostree-sys", path = "rust-bindings/sys", version = "0.15.0" }
-gio = "0.18"
-glib = "0.18"
+gio = "0.20"
+glib = "0.20"
 hex = "0.4.2"
 libc = "0.2"
 once_cell = "1.4.0"
@@ -101,3 +101,4 @@ v2022_7 = ["v2022_6", "ffi/v2022_7"]
 v2023_1 = ["v2022_7", "ffi/v2023_1"]
 v2023_8 = ["v2023_1", "ffi/v2023_8"]
 v2023_11 = ["v2023_8", "ffi/v2023_11"]
+v2025_1 = ["v2023_11", "ffi/v2025_1"]
diff --git a/rust-bindings/Makefile b/rust-bindings/Makefile
@@ -1,6 +1,6 @@
 GIR_REPO := https://github.com/gtk-rs/gir.git
 GIR_VERSION := 5433e2582f831d551789ee95fa04188d2a5fd3e5 # 0.20.4
-GIR_FILES_VERSION := 0.19.0
+GIR_FILES_VERSION := 0.20.0
 OSTREE_REPO := ../ostree
 OSTREE_VERSION := patch-v2022.2
 RUSTDOC_STRIPPER_VERSION := 0.1.17

diff --git a/rust-bindings/src/auto/repo.rs b/rust-bindings/src/auto/repo.rs
diff --git a/rust-bindings/src/auto/sysroot.rs b/rust-bindings/src/auto/sysroot.rs
diff --git a/rust-bindings/src/auto/versions.txt b/rust-bindings/src/auto/versions.txt
diff --git a/rust-bindings/src/repo.rs b/rust-bindings/src/repo.rs
@@ -5,7 +5,8 @@ use crate::RepoMode;
 use crate::{Checksum, ObjectDetails, ObjectName, ObjectType, Repo, RepoTransactionStats};
 use ffi::OstreeRepoListObjectsFlags;
 use glib::ffi as glib_sys;
-use glib::{self, translate::*, Error, IsA};
+use glib::prelude::*;
+use glib::{self, translate::*, Error};
 #[cfg(any(feature = "v2017_10", feature = "dox"))]
 use std::os::fd::BorrowedFd;
 use std::{

diff --git a/rust-bindings/src/sysroot.rs b/rust-bindings/src/sysroot.rs
@@ -74,6 +74,8 @@ impl Sysroot {
 
 #[cfg(test)]
 mod tests {
+    use gio::prelude::FileExt;
+
     use super::*;
 
     #[test]
@@ -112,6 +114,6 @@ mod tests {
 
             sysroot.path()
         };
-        assert_eq!(path_created.to_string(), path_loaded.to_string());
+        assert_eq!(path_created.path(), path_loaded.path());
     }
 }
diff --git a/rust-bindings/sys/Cargo.toml b/rust-bindings/sys/Cargo.toml
@@ -5,13 +5,13 @@ system-deps = "7"
 libc = "0.2"
 
 [dependencies.gio-sys]
-version = "0.18"
+version = "0.20"
 
 [dependencies.glib-sys]
-version = "0.18"
+version = "0.20"
 
 [dependencies.gobject-sys]
-version = "0.18"
+version = "0.20"
 
 [dev-dependencies]
 shell-words = "1.0.0"
@@ -68,6 +68,8 @@ v2022_7 = ["v2022_5"]
 v2023_1 = ["v2022_7"]
 v2023_8 = ["v2023_1"]
 v2023_11 = ["v2023_8"]
+v2025_1 = ["v2024_7"]
+v2024_7 = ["v2023_11"]
 
 [lib]
 name = "ostree_sys"
@@ -241,3 +243,9 @@ version = "2023.8"
 
 [package.metadata.system-deps.ostree_1.v2023_11]
 version = "2023.11"
+
+[package.metadata.system-deps.ostree_1.v2025_1]
+version = "2025.1"
+
+[package.metadata.system-deps.ostree_1.v2024_7]
+version = "2024.7"
diff --git 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 @ 5433e2582f83)
-from gir-files (@ 1ceef435b152)
+from gir-files (@ b89f209a09cf)
diff --git a/rust-bindings/sys/src/lib.rs b/rust-bindings/sys/src/lib.rs
@@ -1854,6 +1854,8 @@ extern "C" {
         cancellable: *mut gio::GCancellable,
         error: *mut *mut glib::GError,
     ) -> gboolean;
+    #[cfg(feature = "v2024_7")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "v2024_7")))]
     pub fn ostree_repo_checkout_composefs(
         self_: *mut OstreeRepo,
         options: *mut glib::GVariant,
@@ -3084,6 +3086,8 @@ extern "C" {
         cancellable: *mut gio::GCancellable,
         error: *mut *mut glib::GError,
     ) -> gboolean;
+    #[cfg(feature = "v2025_1")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "v2025_1")))]
     pub fn ostree_sysroot_deployment_kexec_load(
         self_: *mut OstreeSysroot,
         deployment: *mut OstreeDeployment,

diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c
@@ -1285,6 +1285,8 @@ compare_verity_digests (GVariant *metadata_composefs, const guchar *fsverity_dig
  *
  *  - verity: `u`: 0 = disabled, 1 = set if present on file, 2 = enabled; any other value is a fatal
  * error
+ *
+ * Since: 2024.7
  */
 gboolean
 ostree_repo_checkout_composefs (OstreeRepo *self, GVariant *options, int destination_dfd,

diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
@@ -4270,6 +4270,8 @@ ostree_sysroot_deployment_set_mutable (OstreeSysroot *self, OstreeDeployment *de
  * @error: Error
  *
  * Prepare the specified deployment for a kexec.
+ *
+ * Since: 2025.1
  */
 gboolean
 ostree_sysroot_deployment_kexec_load (OstreeSysroot *self, OstreeDeployment *deployment,