https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256581

--- ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer-base/sys/Cargo.toml.orig	2021-01-25 11:56:55 UTC
+++ ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer-base/sys/Cargo.toml
@@ -3,12 +3,8 @@ system-deps = "2.0"
 
 [dependencies]
 libc = "0.2"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
 
 [dependencies.gstreamer-sys]
 path = "../../gstreamer/sys"
--- ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer-player/sys/Cargo.toml.orig	2021-01-25 11:56:55 UTC
+++ ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer-player/sys/Cargo.toml
@@ -3,12 +3,8 @@ system-deps = "2.0"
 
 [dependencies]
 libc = "0.2"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
 
 [dependencies.gstreamer-sys]
 path = "../../gstreamer/sys"
--- ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer-video/sys/Cargo.toml.orig	2021-01-25 11:56:55 UTC
+++ ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer-video/sys/Cargo.toml
@@ -3,12 +3,8 @@ system-deps = "2.0"
 
 [dependencies]
 libc = "0.2"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
 
 [dependencies.gstreamer-base-sys]
 path = "../../gstreamer-base/sys"
--- ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer/sys/Cargo.toml.orig	2021-01-25 11:56:55 UTC
+++ ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer/sys/Cargo.toml
@@ -3,12 +3,8 @@ system-deps = "2.0"
 
 [dependencies]
 libc = "0.2"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
 
 [dev-dependencies]
 shell-words = "1.0.0"
--- ../gtk4-rs-64d0e1c1344458a065ccf22dcecf105c55b902ca/gdk4/sys/Cargo.toml.orig	2021-01-25 20:09:24 UTC
+++ ../gtk4-rs-64d0e1c1344458a065ccf22dcecf105c55b902ca/gdk4/sys/Cargo.toml
@@ -3,24 +3,12 @@ system-deps = "2.0"
 
 [dependencies]
 libc = "0.2"
-
-[dependencies.cairo-sys-rs]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gdk-pixbuf-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gio-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.pango-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
 
 [dev-dependencies]
 shell-words = "1.0.0"
--- ../gtk4-rs-64d0e1c1344458a065ccf22dcecf105c55b902ca/gsk4/sys/Cargo.toml.orig	2021-01-25 20:09:24 UTC
+++ ../gtk4-rs-64d0e1c1344458a065ccf22dcecf105c55b902ca/gsk4/sys/Cargo.toml
@@ -3,24 +3,14 @@ system-deps = "2.0"
 
 [dependencies]
 libc = "0.2"
+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+graphene-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
 
-[dependencies.cairo-sys-rs]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
 [dependencies.gdk4-sys]
 path = "../../gdk4/sys"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.graphene-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.pango-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
 
 [dev-dependencies]
 shell-words = "1.0.0"
--- ../gtk4-rs-64d0e1c1344458a065ccf22dcecf105c55b902ca/gtk4/sys/Cargo.toml.orig	2021-01-25 20:09:24 UTC
+++ ../gtk4-rs-64d0e1c1344458a065ccf22dcecf105c55b902ca/gtk4/sys/Cargo.toml
@@ -3,33 +3,19 @@ system-deps = "2.0"
 
 [dependencies]
 libc = "0.2"
+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+graphene-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
 
-[dependencies.cairo-sys-rs]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gdk-pixbuf-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
 [dependencies.gdk4-sys]
 path = "../../gdk4/sys"
 
-[dependencies.gio-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.graphene-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
 [dependencies.gsk4-sys]
 path = "../../gsk4/sys"
-
-[dependencies.pango-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
 
 [dev-dependencies]
 shell-words = "1.0.0"
--- ../libadwaita-rs-b898c11fb6776fc7a9a6b920222fa3173216a80c/libadwaita/Cargo.toml.orig	2021-01-15 00:37:53 UTC
+++ ../libadwaita-rs-b898c11fb6776fc7a9a6b920222fa3173216a80c/libadwaita/Cargo.toml
@@ -8,28 +8,15 @@ edition = "2018"
 libc = '0.2'
 bitflags = '1.2'
 lazy_static = '1.4'
+glib = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gio = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gdk-pixbuf = { git = "https://github.com/gtk-rs/gtk3-rs" }
+pango = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gdk = { package = "gdk4", git = "https://github.com/gtk-rs/gtk4-rs" }
+gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs" }
+
 [lib]
 name = "libadwaita"
-
-[dependencies.glib]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gio]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gdk-pixbuf]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.pango]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gdk]
-package = "gdk4"
-git = "https://github.com/gtk-rs/gtk4-rs"
-
-[dependencies.gtk]
-package = "gtk4"
-git = "https://github.com/gtk-rs/gtk4-rs"
 
 [dependencies.ffi]
 package = "libadwaita-sys"
--- ../libadwaita-rs-b898c11fb6776fc7a9a6b920222fa3173216a80c/libadwaita/sys/Cargo.toml.orig	2021-01-15 00:37:53 UTC
+++ ../libadwaita-rs-b898c11fb6776fc7a9a6b920222fa3173216a80c/libadwaita/sys/Cargo.toml
@@ -16,29 +16,13 @@ name = "libadwaita_sys"
 
 [dependencies]
 libc = "0.2"
-
-[dependencies.gio-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gdk-pixbuf-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.pango-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gtk-sys]
-package = "gtk4-sys"
-git = "https://github.com/gtk-rs/gtk4-rs"
-
-[dependencies.gdk-sys]
-package = "gdk4-sys"
-git = "https://github.com/gtk-rs/gtk4-rs"
+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gtk-sys = { package = "gtk4-sys", git = "https://github.com/gtk-rs/gtk4-rs" }
+gdk-sys = { package = "gdk4-sys", git = "https://github.com/gtk-rs/gtk4-rs" }
 
 [build-dependencies]
 system-deps = "2.0"
--- Cargo.toml.orig	2021-02-08 23:38:19 UTC
+++ Cargo.toml
@@ -7,42 +7,17 @@ edition = "2018"
 once_cell = "1.4.0"
 regex = "1.3.4"
 gtk-macros = "0.2.0"
+gtk = { package ="gtk4", git = "https://github.com/gtk-rs/gtk4-rs" }
+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
+gdk = { package = "gdk4", git = "https://github.com/gtk-rs/gtk4-rs" }
+gio = { git = "https://github.com/gtk-rs/gtk3-rs", features = ["v2_60"] }
+glib = { git = "https://github.com/gtk-rs/gtk3-rs", features = ["v2_60"] }
+gstreamer = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
+gstreamer-player = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
+libadwaita = { git = "https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs" }
+pango = { git = "https://github.com/gtk-rs/gtk3-rs", features = ["v1_44"] }
 
-[dependencies.gtk]
-git = "https://github.com/gtk-rs/gtk4-rs"
-package ="gtk4"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gdk]
-git = "https://github.com/gtk-rs/gtk4-rs"
-package = "gdk4"
-
-[dependencies.gio]
-git = "https://github.com/gtk-rs/gtk3-rs"
-features = ["v2_60"]
-
-[dependencies.glib]
-git = "https://github.com/gtk-rs/gtk3-rs"
-features = ["v2_60"]
-
-[dependencies.gstreamer]
-git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
-
-[dependencies.gstreamer-player]
-git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
-
 [dependencies.gettext-rs]
 version = "0.4.4"
 features = ["gettext-system"]
-
-[dependencies.libadwaita]
-git = "https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs"
-
-[dependencies.pango]
-git = "https://github.com/gtk-rs/gtk3-rs"
-features = ["v1_44"]
