Skip to content

Commit

Permalink
Merge pull request #3376 from Mstrodl/feature/mstrodl/update-gir
Browse files Browse the repository at this point in the history
Update GIR
  • Loading branch information
cgwalters authored Feb 1, 2025
2 parents c0f8db1 + f8a57ba commit 968b0b1
Show file tree
Hide file tree
Showing 40 changed files with 1,966 additions and 2,310 deletions.
8 changes: 5 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ license = "MIT"
name = "ostree"
readme = "rust-bindings/README.md"
repository = "https://github.com/ostreedev/ostree"
rust-version = "1.70.0"
version = "0.19.1"
rust-version = "1.77.0"
version = "0.20.0"

include = [
"/COPYING",
Expand All @@ -36,7 +36,7 @@ members = [".", "rust-bindings/sys"]
[dependencies]
base64 = "0.20.0"
bitflags = "1.2.1"
ffi = { package = "ostree-sys", path = "rust-bindings/sys", version = "0.14.0" }
ffi = { package = "ostree-sys", path = "rust-bindings/sys", version = "0.15.0" }
gio = "0.18"
glib = "0.18"
hex = "0.4.2"
Expand Down Expand Up @@ -99,3 +99,5 @@ v2022_5 = ["v2022_2", "ffi/v2022_5"]
v2022_6 = ["v2022_5", "ffi/v2022_6"]
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"]
6 changes: 4 additions & 2 deletions rust-bindings/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
GIR_REPO := https://github.com/gtk-rs/gir.git
GIR_VERSION := 0eeebbdf9d4d5a0b0148c7fa055bf961e16e54a0
GIR_VERSION := 5433e2582f831d551789ee95fa04188d2a5fd3e5 # 0.20.4
GIR_FILES_VERSION := 0.19.0
OSTREE_REPO := ../ostree
OSTREE_VERSION := patch-v2022.2
RUSTDOC_STRIPPER_VERSION := 0.1.17
Expand Down Expand Up @@ -35,6 +36,7 @@ update-gir-files: \
remove-gir-files \
gir-files \
gir-files/GLib-2.0.gir \
gir-files/GModule-2.0.gir \
gir-files/Gio-2.0.gir \
gir-files/GObject-2.0.gir \
gir-files/OSTree-1.0.gir
Expand All @@ -46,7 +48,7 @@ gir-files:
mkdir -p gir-files

%.gir:
curl -o $@ -L https://github.com/gtk-rs/gir-files/raw/master/${@F}
curl -o $@ -L https://github.com/gtk-rs/gir-files/raw/$(GIR_FILES_VERSION)/${@F}

gir-files/OSTree-1.0.gir:
ln -sfr ../OSTree-1.0.gir $@
48 changes: 19 additions & 29 deletions rust-bindings/src/auto/async_progress.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 14 additions & 22 deletions rust-bindings/src/auto/bootconfig_parser.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions rust-bindings/src/auto/collection_ref.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions rust-bindings/src/auto/commit_sizes_entry.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 968b0b1

Please sign in to comment.