fixup: Regen without a local gir commit

bilelmoussaoui · bilelmoussaoui · commit dab4eff9b1e3 · 2024-02-01T01:33:32.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -48,28 +48,15 @@ rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
 
 [workspace.dependencies]
-cairo-sys-rs = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19"}
 cairo-rs = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["use_glib"]}
-gdk-pixbuf-sys = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19"}
 gdk-pixbuf = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19"}
-gio-sys = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v2_66"]}
 gio = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v2_66"]}
-gobject-sys = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v2_66"]}
-glib-sys = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v2_66"]}
 glib = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v2_66"]}
-graphene-sys = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19"}
 graphene = {package = "graphene-rs", git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19"}
 libc = "0.2"
-pango-sys = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v1_46"]}
 pango = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v1_46"]}
 gir-format-check = "^0.1"
-gdk4-sys = {path = "gdk4/sys", version = "0.8"}
 gdk = {package = "gdk4", path = "gdk4", version = "0.8"}
-gsk4-sys = {path = "gsk4/sys", version = "0.8"}
 gsk = {package = "gsk4", path = "gsk4", version = "0.8"}
 gtk4-macros = {path = "gtk4-macros", version = "0.8"}
-gtk = { path = "gtk4", package = "gtk4", version = "0.8" }
-system-deps = "6"
-pkg-config = "0.3.24"
-shell-words = "1.0.0"
-tempfile = "3"
+gtk = { path = "gtk4", package = "gtk4", version = "0.8" }
diff --git a/gdk4-wayland/src/auto/versions.txt b/gdk4-wayland/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 7e319077b8b6)
+Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
diff --git a/gdk4-wayland/sys/Cargo.toml b/gdk4-wayland/sys/Cargo.toml
@@ -58,8 +58,10 @@ v4_12 = ["v4_10"]
 [dependencies]
 libc = "0.2"
 
-[dependencies.glib-sys]
-workspace = true
+[dependencies.glib]
+package = "glib-sys"
+git = "https://github.com/gtk-rs/gtk-rs-core"
+version = "0.19"
 
 [build-dependencies]
 system-deps = "6"
diff --git a/gdk4-wayland/sys/src/lib.rs b/gdk4-wayland/sys/src/lib.rs
@@ -11,8 +11,6 @@
 )]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
-use glib_sys as glib;
-
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
diff --git a/gdk4-wayland/sys/versions.txt b/gdk4-wayland/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 7e319077b8b6)
+Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
diff --git a/gdk4-win32/src/auto/versions.txt b/gdk4-win32/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 7e319077b8b6)
+Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
diff --git a/gdk4-win32/sys/Cargo.toml b/gdk4-win32/sys/Cargo.toml
@@ -54,14 +54,15 @@ v4_8 = ["v4_4"]
 [dependencies]
 libc = "0.2"
 
-[dependencies.gdk4-sys]
-workspace = true
+[dependencies.gdk]
+package = "gdk4-sys"
+path = "../../gdk4/sys"
+version = "0.8"
 
 [dependencies.glib]
-workspace = true
-
-[dependencies.gdk-pixbuf]
-workspace = true
+package = "glib-sys"
+git = "https://github.com/gtk-rs/gtk-rs-core.git"
+version = "0.19"
 
 [build-dependencies]
 system-deps = "6"
diff --git a/gdk4-win32/sys/src/lib.rs b/gdk4-win32/sys/src/lib.rs
@@ -11,9 +11,6 @@
 )]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
-use gdk4_sys as gdk;
-use glib_sys as glib;
-
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
diff --git a/gdk4-win32/sys/versions.txt b/gdk4-win32/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 7e319077b8b6)
+Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
diff --git a/gdk4-x11/src/auto/versions.txt b/gdk4-x11/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 7e319077b8b6)
+Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
diff --git a/gdk4-x11/sys/Cargo.toml b/gdk4-x11/sys/Cargo.toml
@@ -54,11 +54,15 @@ v4_10 = ["v4_4"]
 [dependencies]
 libc = "0.2"
 
-[dependencies.gdk4-sys]
-workspace = true
-
-[dependencies.glib-sys]
-workspace = true
+[dependencies.gdk]
+package = "gdk4-sys"
+path = "../../gdk4/sys"
+version = "0.8"
+
+[dependencies.glib]
+package = "glib-sys"
+git = "https://github.com/gtk-rs/gtk-rs-core"
+version = "0.19"
 
 [build-dependencies]
 system-deps = "6"
diff --git a/gdk4-x11/sys/src/lib.rs b/gdk4-x11/sys/src/lib.rs
@@ -11,9 +11,6 @@
 )]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
-use gdk4_sys as gdk;
-use glib_sys as glib;
-
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
diff --git a/gdk4-x11/sys/versions.txt b/gdk4-x11/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 7e319077b8b6)
+Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
diff --git a/gdk4/src/auto/versions.txt b/gdk4/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 7e319077b8b6)
+Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
diff --git a/gdk4/sys/Cargo.toml b/gdk4/sys/Cargo.toml
@@ -74,29 +74,39 @@ v4_14 = ["v4_12"]
 [dependencies]
 libc = "0.2"
 
-[dependencies.cairo-sys-rs]
-workspace = true
-
-[dependencies.gdk-pixbuf-sys]
-workspace = true
-
-[dependencies.gio-sys]
-workspace = true
-
-[dependencies.glib-sys]
-workspace = true
-
-[dependencies.gobject-sys]
-workspace = true
-
-[dependencies.pango-sys]
-workspace = true
+[dependencies.cairo]
+package = "cairo-sys-rs"
+git = "https://github.com/gtk-rs/gtk-rs-core"
+version = "0.19"
+
+[dependencies.gdk_pixbuf]
+package = "gdk-pixbuf-sys"
+git = "https://github.com/gtk-rs/gtk-rs-core"
+version = "0.19"
+
+[dependencies.gio]
+package = "gio-sys"
+git = "https://github.com/gtk-rs/gtk-rs-core"
+version = "0.19"
+
+[dependencies.glib]
+package = "glib-sys"
+git = "https://github.com/gtk-rs/gtk-rs-core"
+version = "0.19"
+
+[dependencies.gobject]
+package = "gobject-sys"
+git = "https://github.com/gtk-rs/gtk-rs-core"
+version = "0.19"
+
+[dependencies.pango]
+package = "pango-sys"
+git = "https://github.com/gtk-rs/gtk-rs-core"
+version = "0.19"
 
 [build-dependencies]
 system-deps = "6"
-
-[build-dependencies.pkg-config]
-workspace = true
+pkg-config = "0.3.24"
 
 [dev-dependencies]
 shell-words = "1.0.0"
diff --git a/gdk4/sys/src/lib.rs b/gdk4/sys/src/lib.rs
@@ -11,13 +11,6 @@
 )]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
-use cairo_sys as cairo;
-use gdk_pixbuf_sys as gdk_pixbuf;
-use gio_sys as gio;
-use glib_sys as glib;
-use gobject_sys as gobject;
-use pango_sys as pango;
-
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
diff --git a/gdk4/sys/versions.txt b/gdk4/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 7e319077b8b6)
+Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
diff --git a/gir b/gir
@@ -1 +1 @@
-Subproject commit 7e319077b8b6b8328800a0211aa160e272de8a4d
+Subproject commit 68044d02c2a373011dd3a9ae4685ae1453fa0844
diff --git a/gsk4/src/auto/versions.txt b/gsk4/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 7e319077b8b6)
+Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
diff --git a/gsk4/sys/Cargo.toml b/gsk4/sys/Cargo.toml
@@ -68,23 +68,35 @@ v4_14 = ["v4_10"]
 [dependencies]
 libc = "0.2"
 
-[dependencies.cairo-sys-rs]
-workspace = true
-
-[dependencies.gdk4-sys]
-workspace = true
-
-[dependencies.glib-sys]
-workspace = true
-
-[dependencies.gobject-sys]
-workspace = true
-
-[dependencies.graphene-sys]
-workspace = true
-
-[dependencies.pango-sys]
-workspace = true
+[dependencies.cairo]
+package = "cairo-sys-rs"
+git = "https://github.com/gtk-rs/gtk-rs-core"
+version = "0.19"
+
+[dependencies.gdk]
+package = "gdk4-sys"
+path = "../../gdk4/sys"
+version = "0.8"
+
+[dependencies.glib]
+package = "glib-sys"
+git = "https://github.com/gtk-rs/gtk-rs-core"
+version = "0.19"
+
+[dependencies.gobject]
+package = "gobject-sys"
+git = "https://github.com/gtk-rs/gtk-rs-core"
+version = "0.19"
+
+[dependencies.graphene]
+package = "graphene-sys"
+git = "https://github.com/gtk-rs/gtk-rs-core"
+version = "0.19"
+
+[dependencies.pango]
+package = "pango-sys"
+git = "https://github.com/gtk-rs/gtk-rs-core"
+version = "0.19"
 
 [build-dependencies]
 system-deps = "6"
diff --git a/gsk4/sys/src/lib.rs b/gsk4/sys/src/lib.rs
@@ -11,13 +11,6 @@
 )]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
-use cairo_sys as cairo;
-use gdk4_sys as gdk;
-use glib_sys as glib;
-use gobject_sys as gobject;
-use graphene_sys as graphene;
-use pango_sys as pango;
-
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
diff --git a/gsk4/sys/versions.txt b/gsk4/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 7e319077b8b6)
+Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
diff --git a/gtk4/src/auto/versions.txt b/gtk4/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 7e319077b8b6)
+Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
diff --git a/gtk4/src/subclass/widget.rs b/gtk4/src/subclass/widget.rs
@@ -1018,7 +1018,6 @@ pub unsafe trait WidgetClassExt: ClassStruct {
         keyval: gdk::Key,
         mods: gdk::ModifierType,
         callback: F,
-        arguments: Option<&glib::Variant>,
     ) {
         let shortcut = crate::Shortcut::new(
             Some(crate::KeyvalTrigger::new(keyval, mods)),
@@ -1028,7 +1027,6 @@ pub unsafe trait WidgetClassExt: ClassStruct {
                 },
             )),
         );
-        shortcut.set_arguments(arguments);
         self.add_shortcut(&shortcut);
     }
 
@@ -1038,13 +1036,11 @@ pub unsafe trait WidgetClassExt: ClassStruct {
         keyval: gdk::Key,
         mods: gdk::ModifierType,
         action_name: &str,
-        arguments: Option<&glib::Variant>,
     ) {
         let shortcut = crate::Shortcut::new(
             Some(crate::KeyvalTrigger::new(keyval, mods)),
             Some(crate::NamedAction::new(action_name)),
         );
-        shortcut.set_arguments(arguments);
         self.add_shortcut(&shortcut);
     }
 
@@ -1054,7 +1050,6 @@ pub unsafe trait WidgetClassExt: ClassStruct {
         keyval: gdk::Key,
         mods: gdk::ModifierType,
         signal_name: &str,
-        arguments: Option<&glib::Variant>,
     ) {
         let type_ = <Self::Type as ObjectSubclassType>::type_();
         assert!(
@@ -1066,7 +1061,6 @@ pub unsafe trait WidgetClassExt: ClassStruct {
             Some(crate::KeyvalTrigger::new(keyval, mods)),
             Some(crate::SignalAction::new(signal_name)),
         );
-        shortcut.set_arguments(arguments);
         self.add_shortcut(&shortcut);
     }
 
diff --git a/gtk4/sys/Cargo.toml b/gtk4/sys/Cargo.toml
diff --git a/gtk4/sys/src/lib.rs b/gtk4/sys/src/lib.rs
diff --git a/gtk4/sys/versions.txt b/gtk4/sys/versions.txt

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Generated by gir (https://github.com/gtk-rs/gir @ 7e319077b8b6)`
	`1`	`+Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)`
`2`	`2`	`from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)`