From 2c0730209771cc7fa121440bc8487a4f88c50d32 Mon Sep 17 00:00:00 2001 From: Felix Krull Date: Fri, 28 Jun 2019 20:28:21 +0200 Subject: [PATCH] Update to new glib-rs versions --- rust-bindings/rust/Cargo.toml | 14 +++++++------- rust-bindings/rust/README.md | 4 ++-- rust-bindings/rust/conf/ostree.toml | 7 ++++++- .../rust/src/auto/repo_transaction_stats.rs | 2 ++ rust-bindings/rust/sys/Cargo.toml | 8 ++++---- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/rust-bindings/rust/Cargo.toml b/rust-bindings/rust/Cargo.toml index 163d592b..795fbd77 100644 --- a/rust-bindings/rust/Cargo.toml +++ b/rust-bindings/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ostree" -version = "0.4.0" +version = "0.5.0" authors = ["Felix Krull"] license = "MIT" @@ -32,12 +32,12 @@ name = "ostree" libc = "0.2" bitflags = "1" lazy_static = "1.1" -glib = "0.7.1" -gio = "0.6.0" -glib-sys = "0.8.0" -gobject-sys = "0.8.0" -gio-sys = "0.8.0" -ostree-sys = { version = "0.3.0", path = "sys" } +glib = "0.8.0" +gio = "0.7.0" +glib-sys = "0.9.0" +gobject-sys = "0.9.0" +gio-sys = "0.9.0" +ostree-sys = { version = "0.4.0", path = "sys" } [dev-dependencies] maplit = "1.0.1" diff --git a/rust-bindings/rust/README.md b/rust-bindings/rust/README.md index 8ae8b9a9..a3c84de6 100644 --- a/rust-bindings/rust/README.md +++ b/rust-bindings/rust/README.md @@ -31,7 +31,7 @@ To use the crate, add it to your `Cargo.toml`: ```toml [dependencies] -ostree = "0.4" +ostree = "0.5" ``` To use features from later libostree versions, you need to specify the release @@ -39,7 +39,7 @@ version as well: ```toml [dependencies.ostree] -version = "0.4" +version = "0.5" features = ["v2018_7"] ``` diff --git a/rust-bindings/rust/conf/ostree.toml b/rust-bindings/rust/conf/ostree.toml index 77699927..c17812d6 100644 --- a/rust-bindings/rust/conf/ostree.toml +++ b/rust-bindings/rust/conf/ostree.toml @@ -48,7 +48,6 @@ generate = [ "OSTree.RepoPullFlags", "OSTree.RepoRemoteChange", "OSTree.RepoResolveRevExtFlags", - "OSTree.RepoTransactionStats", "OSTree.SePolicy", "OSTree.SePolicyRestoreconFlags", "OSTree.StaticDeltaGenerateOpt", @@ -172,6 +171,12 @@ status = "generate" name = "dup" ignore = true +[[object]] +name = "OSTree.RepoTransactionStats" +status = "generate" +init_function_expression = "|_ptr| ()" +clear_function_expression = "|_ptr| ()" + [[object]] name = "OSTree.*" status = "generate" diff --git a/rust-bindings/rust/src/auto/repo_transaction_stats.rs b/rust-bindings/rust/src/auto/repo_transaction_stats.rs index 1011c4ae..ed91ba69 100644 --- a/rust-bindings/rust/src/auto/repo_transaction_stats.rs +++ b/rust-bindings/rust/src/auto/repo_transaction_stats.rs @@ -12,6 +12,8 @@ glib_wrapper! { match fn { copy => |ptr| gobject_sys::g_boxed_copy(ostree_sys::ostree_repo_transaction_stats_get_type(), ptr as *mut _) as *mut ostree_sys::OstreeRepoTransactionStats, free => |ptr| gobject_sys::g_boxed_free(ostree_sys::ostree_repo_transaction_stats_get_type(), ptr as *mut _), + init => |_ptr| (), + clear => |_ptr| (), get_type => || ostree_sys::ostree_repo_transaction_stats_get_type(), } } diff --git a/rust-bindings/rust/sys/Cargo.toml b/rust-bindings/rust/sys/Cargo.toml index c48100dd..466488c7 100644 --- a/rust-bindings/rust/sys/Cargo.toml +++ b/rust-bindings/rust/sys/Cargo.toml @@ -5,9 +5,9 @@ repository = "fkrull/ostree-rs" pkg-config = "0.3.7" [dependencies] -gio-sys = "0.8.0" -glib-sys = "0.8.0" -gobject-sys = "0.8.0" +gio-sys = "0.9.0" +glib-sys = "0.9.0" +gobject-sys = "0.9.0" libc = "0.2" [dev-dependencies] @@ -59,6 +59,6 @@ license = "MIT" links = "ostree-1" name = "ostree-sys" repository = "https://gitlab.com/fkrull/ostree-rs" -version = "0.3.0" +version = "0.4.0" [package.metadata.docs.rs] features = ["dox"]