Skip to content

Commit

Permalink
Use cargo workspace features for ffi
Browse files Browse the repository at this point in the history
  • Loading branch information
@bilelmoussaoui
bilelmoussaoui committed Feb 1, 2024
1 parent e3b304d commit cfaecbe
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 126 deletions.
1 change: 0 additions & 1 deletion Cargo.lock
View file

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

12 changes: 11 additions & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,25 @@ 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" }
gtk4-sys = {path = "gtk4/sys", version = "0.8"}
gtk = { path = "gtk4", package = "gtk4", version = "0.8" }
6 changes: 2 additions & 4 deletions gdk4-wayland/sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,8 @@ v4_12 = ["v4_10"]
[dependencies]
libc = "0.2"

[dependencies.glib]
package = "glib-sys"
git = "https://github.com/gtk-rs/gtk-rs-core"
version = "0.19"
[dependencies.glib-sys]
workspace = true

[build-dependencies]
system-deps = "6"
Expand Down
14 changes: 5 additions & 9 deletions gdk4-win32/sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,11 @@ v4_8 = ["v4_4"]
[dependencies]
libc = "0.2"

[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.git"
version = "0.19"
[dependencies.gdk4-sys]
workspace = true

[dependencies.glib-sys]
workspace = true

[build-dependencies]
system-deps = "6"
Expand Down
14 changes: 5 additions & 9 deletions gdk4-x11/sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,11 @@ v4_10 = ["v4_4"]
[dependencies]
libc = "0.2"

[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.gdk4-sys]
workspace = true

[dependencies.glib-sys]
workspace = true

[build-dependencies]
system-deps = "6"
Expand Down
46 changes: 17 additions & 29 deletions gdk4/sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,35 +74,23 @@ v4_14 = ["v4_12"]
[dependencies]
libc = "0.2"

[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"
[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

[build-dependencies]
system-deps = "6"
Expand Down
43 changes: 14 additions & 29 deletions gsk4/sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,35 +68,20 @@ v4_14 = ["v4_10"]
[dependencies]
libc = "0.2"

[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"
[dependencies.cairo-sys-rs]
workspace = true

[dependencies.glib-sys]
workspace = true

[dependencies.gobject-sys]
workspace = true

[dependencies.pango-sys]
workspace = true

[dependencies.gdk4-sys]
workspace = true

[build-dependencies]
system-deps = "6"
Expand Down
70 changes: 26 additions & 44 deletions gtk4/sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,50 +75,32 @@ v4_14 = ["v4_12"]
[dependencies]
libc = "0.2"

[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.gdk]
package = "gdk4-sys"
path = "../../gdk4/sys"
version = "0.8"

[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.graphene]
package = "graphene-sys"
git = "https://github.com/gtk-rs/gtk-rs-core"
version = "0.19"

[dependencies.gsk]
package = "gsk4-sys"
path = "../../gsk4/sys"
version = "0.8"

[dependencies.pango]
package = "pango-sys"
git = "https://github.com/gtk-rs/gtk-rs-core"
version = "0.19"
[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.graphene-sys]
workspace = true

[dependencies.gdk4-sys]
workspace = true

[dependencies.gsk4-sys]
workspace = true

[build-dependencies]
system-deps = "6"
Expand Down

0 comments on commit cfaecbe

Please sign in to comment.