From 92d653c47fb21c5d595ec907c84d7725d6654858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 22 Oct 2024 14:28:07 +0300 Subject: [PATCH] Update gtk-rs dependencies from master to main branch Part-of: --- Cargo.lock | 44 ++++++++++++++++++++++---------------------- Cargo.toml | 16 ++++++++-------- gir | 2 +- gir-files | 2 +- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e916a8a14..d78de5046 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -162,14 +162,14 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "cairo-rs" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#260d747d4f464cd015d4d664a753f1cf38c55b7b" dependencies = [ "bitflags 2.6.0", "cairo-sys-rs", @@ -180,7 +180,7 @@ dependencies = [ [[package]] name = "cairo-sys-rs" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#260d747d4f464cd015d4d664a753f1cf38c55b7b" dependencies = [ "glib-sys", "libc", @@ -713,7 +713,7 @@ dependencies = [ [[package]] name = "gio" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#260d747d4f464cd015d4d664a753f1cf38c55b7b" dependencies = [ "futures-channel", "futures-core", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "gio-sys" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#260d747d4f464cd015d4d664a753f1cf38c55b7b" dependencies = [ "glib-sys", "gobject-sys", @@ -758,7 +758,7 @@ dependencies = [ [[package]] name = "glib" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#260d747d4f464cd015d4d664a753f1cf38c55b7b" dependencies = [ "bitflags 2.6.0", "futures-channel", @@ -778,7 +778,7 @@ dependencies = [ [[package]] name = "glib-macros" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#260d747d4f464cd015d4d664a753f1cf38c55b7b" dependencies = [ "heck", "proc-macro-crate", @@ -790,7 +790,7 @@ dependencies = [ [[package]] name = "glib-sys" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#260d747d4f464cd015d4d664a753f1cf38c55b7b" dependencies = [ "libc", "system-deps", @@ -864,7 +864,7 @@ dependencies = [ [[package]] name = "gobject-sys" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#260d747d4f464cd015d4d664a753f1cf38c55b7b" dependencies = [ "glib-sys", "libc", @@ -1947,7 +1947,7 @@ dependencies = [ [[package]] name = "pango" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#260d747d4f464cd015d4d664a753f1cf38c55b7b" dependencies = [ "gio", "glib", @@ -1958,7 +1958,7 @@ dependencies = [ [[package]] name = "pango-sys" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#260d747d4f464cd015d4d664a753f1cf38c55b7b" dependencies = [ "glib-sys", "gobject-sys", @@ -1969,7 +1969,7 @@ dependencies = [ [[package]] name = "pangocairo" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#260d747d4f464cd015d4d664a753f1cf38c55b7b" dependencies = [ "cairo-rs", "glib", @@ -1981,7 +1981,7 @@ dependencies = [ [[package]] name = "pangocairo-sys" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f27194b7aee1459103835c3cd42d2e288d7081f1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#260d747d4f464cd015d4d664a753f1cf38c55b7b" dependencies = [ "cairo-sys-rs", "glib-sys", @@ -2177,9 +2177,9 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.211" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "1ac55e59090389fb9f0dd9e0f3c09615afed1d19094284d0b200441f13550793" dependencies = [ "serde_derive", ] @@ -2195,9 +2195,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.211" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "54be4f245ce16bc58d57ef2716271d0d4519e0f6defa147f6e081005bcb278ff" dependencies = [ "proc-macro2", "quote", @@ -2206,9 +2206,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.131" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d42a0bd4ac281beff598909bb56a86acaf979b84483e1c79c10dcaf98f8cf3" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -2294,9 +2294,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 74a6f31fe..f3d26af05 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -115,14 +115,14 @@ edition = "2021" rust-version = "1.80" [workspace.dependencies] -gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" } -gio-sys = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" } -glib-sys = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" } -gobject-sys = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" } -cairo-rs = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" } -pango = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" } -pangocairo = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" } +gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "main" } +gio-sys = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "main" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "main" } +glib-sys = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "main" } +gobject-sys = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "main" } +cairo-rs = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "main" } +pango = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "main" } +pangocairo = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "main" } gstreamer-allocators-sys = { path = "gstreamer-allocators/sys" } gstreamer-analytics-sys = { path = "gstreamer-analytics/sys" } gstreamer-app-sys = { path = "gstreamer-app/sys" } diff --git a/gir b/gir index 0a15f4e10..a172dda2a 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit 0a15f4e10c41ac6d045f7ccdff95e548eb04e766 +Subproject commit a172dda2a7283d286d45c237b0f8bc39b5354e94 diff --git a/gir-files b/gir-files index e45712216..f7af0e711 160000 --- a/gir-files +++ b/gir-files @@ -1 +1 @@ -Subproject commit e45712216c81cc5e03ac1e5a6846ef9bcf0ef642 +Subproject commit f7af0e711383fefe8ab73b139dfa165dbbc76d4c