Skip to content

Commit 8c608c7

Browse files
bilelmoussaouibilelmoussaoui
committed
Use cargo workspace features for ffi
1 parent 8df8bd6 commit 8c608c7

File tree

7 files changed

+83
-125
lines changed

7 files changed

+83
-125
lines changed

‎Cargo.toml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,25 @@ rustc-args = ["--cfg", "docsrs"]
4848
rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
4949

5050
[workspace.dependencies]
51+
cairo-sys-rs = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19"}
5152
cairo-rs = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["use_glib"]}
53+
gdk-pixbuf-sys = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19"}
5254
gdk-pixbuf = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19"}
55+
gio-sys = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v2_66"]}
5356
gio = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v2_66"]}
57+
gobject-sys = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v2_66"]}
58+
glib-sys = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v2_66"]}
5459
glib = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v2_66"]}
60+
graphene-sys = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19"}
5561
graphene = {package = "graphene-rs", git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19"}
5662
libc = "0.2"
63+
pango-sys = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v1_46"]}
5764
pango = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v1_46"]}
5865
gir-format-check = "^0.1"
66+
gdk4-sys = {path = "gdk4/sys", version = "0.8"}
5967
gdk = {package = "gdk4", path = "gdk4", version = "0.8"}
68+
gsk4-sys = {path = "gsk4/sys", version = "0.8"}
6069
gsk = {package = "gsk4", path = "gsk4", version = "0.8"}
6170
gtk4-macros = {path = "gtk4-macros", version = "0.8"}
62-
gtk = { path = "gtk4", package = "gtk4", version = "0.8" }
71+
gtk4-sys = {path = "gtk4/sys", version = "0.8"}
72+
gtk = { path = "gtk4", package = "gtk4", version = "0.8" }

‎gdk4-wayland/sys/Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ v4_12 = ["v4_10"]
5858
[dependencies]
5959
libc = "0.2"
6060

61-
[dependencies.glib]
62-
package = "glib-sys"
63-
git = "https://github.com/gtk-rs/gtk-rs-core"
64-
version = "0.19"
61+
[dependencies.glib-sys]
62+
workspace = true
6563

6664
[build-dependencies]
6765
system-deps = "6"

‎gdk4-win32/sys/Cargo.toml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,11 @@ v4_8 = ["v4_4"]
5454
[dependencies]
5555
libc = "0.2"
5656

57-
[dependencies.gdk]
58-
package = "gdk4-sys"
59-
path = "../../gdk4/sys"
60-
version = "0.8"
61-
62-
[dependencies.glib]
63-
package = "glib-sys"
64-
git = "https://github.com/gtk-rs/gtk-rs-core.git"
65-
version = "0.19"
57+
[dependencies.gdk4-sys]
58+
workspace = true
59+
60+
[dependencies.glib-sys]
61+
workspace = true
6662

6763
[build-dependencies]
6864
system-deps = "6"

‎gdk4-x11/sys/Cargo.toml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,11 @@ v4_10 = ["v4_4"]
5454
[dependencies]
5555
libc = "0.2"
5656

57-
[dependencies.gdk]
58-
package = "gdk4-sys"
59-
path = "../../gdk4/sys"
60-
version = "0.8"
61-
62-
[dependencies.glib]
63-
package = "glib-sys"
64-
git = "https://github.com/gtk-rs/gtk-rs-core"
65-
version = "0.19"
57+
[dependencies.gdk4-sys]
58+
workspace = true
59+
60+
[dependencies.glib-sys]
61+
workspace = true
6662

6763
[build-dependencies]
6864
system-deps = "6"

‎gdk4/sys/Cargo.toml

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -74,35 +74,23 @@ v4_14 = ["v4_12"]
7474
[dependencies]
7575
libc = "0.2"
7676

77-
[dependencies.cairo]
78-
package = "cairo-sys-rs"
79-
git = "https://github.com/gtk-rs/gtk-rs-core"
80-
version = "0.19"
81-
82-
[dependencies.gdk_pixbuf]
83-
package = "gdk-pixbuf-sys"
84-
git = "https://github.com/gtk-rs/gtk-rs-core"
85-
version = "0.19"
86-
87-
[dependencies.gio]
88-
package = "gio-sys"
89-
git = "https://github.com/gtk-rs/gtk-rs-core"
90-
version = "0.19"
91-
92-
[dependencies.glib]
93-
package = "glib-sys"
94-
git = "https://github.com/gtk-rs/gtk-rs-core"
95-
version = "0.19"
96-
97-
[dependencies.gobject]
98-
package = "gobject-sys"
99-
git = "https://github.com/gtk-rs/gtk-rs-core"
100-
version = "0.19"
101-
102-
[dependencies.pango]
103-
package = "pango-sys"
104-
git = "https://github.com/gtk-rs/gtk-rs-core"
105-
version = "0.19"
77+
[dependencies.cairo-sys-rs]
78+
workspace = true
79+
80+
[dependencies.gdk-pixbuf-sys]
81+
workspace = true
82+
83+
[dependencies.gio-sys]
84+
workspace = true
85+
86+
[dependencies.glib-sys]
87+
workspace = true
88+
89+
[dependencies.gobject-sys]
90+
workspace = true
91+
92+
[dependencies.pango-sys]
93+
workspace = true
10694

10795
[build-dependencies]
10896
system-deps = "6"

‎gsk4/sys/Cargo.toml

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -68,35 +68,23 @@ v4_14 = ["v4_10"]
6868
[dependencies]
6969
libc = "0.2"
7070

71-
[dependencies.cairo]
72-
package = "cairo-sys-rs"
73-
git = "https://github.com/gtk-rs/gtk-rs-core"
74-
version = "0.19"
75-
76-
[dependencies.gdk]
77-
package = "gdk4-sys"
78-
path = "../../gdk4/sys"
79-
version = "0.8"
80-
81-
[dependencies.glib]
82-
package = "glib-sys"
83-
git = "https://github.com/gtk-rs/gtk-rs-core"
84-
version = "0.19"
85-
86-
[dependencies.gobject]
87-
package = "gobject-sys"
88-
git = "https://github.com/gtk-rs/gtk-rs-core"
89-
version = "0.19"
90-
91-
[dependencies.graphene]
92-
package = "graphene-sys"
93-
git = "https://github.com/gtk-rs/gtk-rs-core"
94-
version = "0.19"
95-
96-
[dependencies.pango]
97-
package = "pango-sys"
98-
git = "https://github.com/gtk-rs/gtk-rs-core"
99-
version = "0.19"
71+
[dependencies.graphene-sys]
72+
workspace = true
73+
74+
[dependencies.cairo-sys-rs]
75+
workspace = true
76+
77+
[dependencies.glib-sys]
78+
workspace = true
79+
80+
[dependencies.gobject-sys]
81+
workspace = true
82+
83+
[dependencies.pango-sys]
84+
workspace = true
85+
86+
[dependencies.gdk4-sys]
87+
workspace = true
10088

10189
[build-dependencies]
10290
system-deps = "6"

‎gtk4/sys/Cargo.toml

Lines changed: 26 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -75,50 +75,32 @@ v4_14 = ["v4_12"]
7575
[dependencies]
7676
libc = "0.2"
7777

78-
[dependencies.cairo]
79-
package = "cairo-sys-rs"
80-
git = "https://github.com/gtk-rs/gtk-rs-core"
81-
version = "0.19"
82-
83-
[dependencies.gdk_pixbuf]
84-
package = "gdk-pixbuf-sys"
85-
git = "https://github.com/gtk-rs/gtk-rs-core"
86-
version = "0.19"
87-
88-
[dependencies.gdk]
89-
package = "gdk4-sys"
90-
path = "../../gdk4/sys"
91-
version = "0.8"
92-
93-
[dependencies.gio]
94-
package = "gio-sys"
95-
git = "https://github.com/gtk-rs/gtk-rs-core"
96-
version = "0.19"
97-
98-
[dependencies.glib]
99-
package = "glib-sys"
100-
git = "https://github.com/gtk-rs/gtk-rs-core"
101-
version = "0.19"
102-
103-
[dependencies.gobject]
104-
package = "gobject-sys"
105-
git = "https://github.com/gtk-rs/gtk-rs-core"
106-
version = "0.19"
107-
108-
[dependencies.graphene]
109-
package = "graphene-sys"
110-
git = "https://github.com/gtk-rs/gtk-rs-core"
111-
version = "0.19"
112-
113-
[dependencies.gsk]
114-
package = "gsk4-sys"
115-
path = "../../gsk4/sys"
116-
version = "0.8"
117-
118-
[dependencies.pango]
119-
package = "pango-sys"
120-
git = "https://github.com/gtk-rs/gtk-rs-core"
121-
version = "0.19"
78+
[dependencies.cairo-sys-rs]
79+
workspace = true
80+
81+
[dependencies.gdk-pixbuf-sys]
82+
workspace = true
83+
84+
[dependencies.gio-sys]
85+
workspace = true
86+
87+
[dependencies.glib-sys]
88+
workspace = true
89+
90+
[dependencies.gobject-sys]
91+
workspace = true
92+
93+
[dependencies.pango-sys]
94+
workspace = true
95+
96+
[dependencies.graphene-sys]
97+
workspace = true
98+
99+
[dependencies.gdk4-sys]
100+
workspace = true
101+
102+
[dependencies.gsk4-sys]
103+
workspace = true
122104

123105
[build-dependencies]
124106
system-deps = "6"

0 commit comments

Comments
 (0)