Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rust glib 0.19 #3262

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ 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" }
gio = "0.18"
glib = "0.18"
ffi = { package = "ostree-sys", path = "rust-bindings/sys", version = "0.15.0" }
gio = "0.19"
glib = "0.19"
hex = "0.4.2"
libc = "0.2"
once_cell = "1.4.0"
Expand Down
9 changes: 5 additions & 4 deletions rust-bindings/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GIR_REPO := https://github.com/gtk-rs/gir.git
GIR_VERSION := 0eeebbdf9d4d5a0b0148c7fa055bf961e16e54a0
d .GIR_REPO := https://github.com/gtk-rs/gir.git
GIR_VERSION := 0.19
OSTREE_REPO := ../ostree
OSTREE_VERSION := patch-v2022.2
RUSTDOC_STRIPPER_VERSION := 0.1.17
Expand All @@ -11,7 +11,7 @@ all: gir

# -- gir generation --
target/tools/bin/gir:
cargo install --root target/tools --git $(GIR_REPO) --rev $(GIR_VERSION) -- gir
cargo install --root target/tools --git $(GIR_REPO) --branch $(GIR_VERSION) -- gir

gir: target/tools/bin/gir
target/tools/bin/gir -c conf/ostree-sys.toml
Expand All @@ -35,6 +35,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 +47,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/0.19/${@F}

gir-files/OSTree-1.0.gir:
ln -sfr ../OSTree-1.0.gir $@
45 changes: 17 additions & 28 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.

35 changes: 13 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.

9 changes: 4 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
Loading