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 1e61895 commit 86e6769
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 54 deletions.
36 changes: 18 additions & 18 deletions Cargo.lock
View file

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

5 changes: 5 additions & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,14 @@ libc = "0.2"
bitflags = "2.4"
thiserror = "1"
gir-format-check = "^0.1"
glib-sys = { path = "glib/sys" }
gobject-sys = { path = "glib/gobject-sys" }
glib = { path = "glib" }
gio-sys = { path = "gio/sys" }
gio = { path = "gio" }
pango-sys = { path = "pango/sys" }
pango = { path = "pango" }
cairo-sys-rs = { path = "cairo/sys" }
cairo-rs = { path = "cairo" }
glib-macros = { path = "glib-macros" }

Expand Down
15 changes: 6 additions & 9 deletions gdk-pixbuf/sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,14 @@ system-deps = "6"
[dependencies]
libc = "0.2"

[dependencies.gio]
package = "gio-sys"
path = "../../gio/sys"
[dependencies.gio-sys]
workspace = true

[dependencies.glib]
package = "glib-sys"
path = "../../glib/sys"
[dependencies.glib-sys]
workspace = true

[dependencies.gobject]
package = "gobject-sys"
path = "../../glib/gobject-sys"
[dependencies.gobject-sys]
workspace = true

[dev-dependencies]
shell-words = "1.0.0"
Expand Down
10 changes: 4 additions & 6 deletions gio/sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@ system-deps = "6"
[dependencies]
libc = "0.2"

[dependencies.glib]
package = "glib-sys"
path = "../../glib/sys"
[dependencies.glib-sys]
workspace = true

[dependencies.gobject]
package = "gobject-sys"
path = "../../glib/gobject-sys"
[dependencies.gobject-sys]
workspace = true

[target."cfg(windows)".dependencies.windows-sys]
version = "0.52"
Expand Down
5 changes: 2 additions & 3 deletions glib/gobject-sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ system-deps = "6"
[dependencies]
libc = "0.2"

[dependencies.glib]
package = "glib-sys"
path = "../sys"
[dependencies.glib-sys]
workspace = true

[dev-dependencies]
shell-words = "1.0.0"
Expand Down
5 changes: 2 additions & 3 deletions graphene/sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ system-deps = "6"
[dependencies]
libc = "0.2"

[dependencies.glib]
package = "glib-sys"
path = "../../glib/sys"
[dependencies.glib-sys]
workspace = true

[dev-dependencies]
shell-words = "1.0.0"
Expand Down
10 changes: 4 additions & 6 deletions pango/sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@ system-deps = "6"
[dependencies]
libc = "0.2"

[dependencies.glib]
package = "glib-sys"
path = "../../glib/sys"
[dependencies.glib-sys]
workspace = true

[dependencies.gobject]
package = "gobject-sys"
path = "../../glib/gobject-sys"
[dependencies.gobject-sys]
workspace = true

[dev-dependencies]
shell-words = "1.0.0"
Expand Down
15 changes: 6 additions & 9 deletions pangocairo/sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,14 @@ system-deps = "6"
[dependencies]
libc = "0.2"

[dependencies.cairo]
package = "cairo-sys-rs"
path = "../../cairo/sys"
[dependencies.cairo-sys-rs]
workspace = true

[dependencies.glib]
package = "glib-sys"
path = "../../glib/sys"
[dependencies.glib-sys]
workspace = true

[dependencies.pango]
package = "pango-sys"
path = "../../pango/sys"
[dependencies.pango-sys]
workspace = true

[dev-dependencies]
shell-words = "1.0.0"
Expand Down

0 comments on commit 86e6769

Please sign in to comment.