Skip to content

Commit 1601207

Browse files
sdroegebilelmoussaoui
authored andcommitted
Point to git 0.15 versions of the gtk-rs-core dependencies
This makes sure we're building against the latest 0.15 versions while still being able to publish to crates.io.
1 parent 69ba621 commit 1601207

File tree

10 files changed

+59
-19
lines changed

10 files changed

+59
-19
lines changed

gdk4-wayland/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ features = ["dox"]
2525
[dependencies]
2626
ffi = {path = "./sys", package = "gdk4-wayland-sys", version = "0.4.1"}
2727
gdk = {path = "../gdk4", package = "gdk4", version = "0.4.1"}
28-
gio = {version = "0.15.1", features = ["v2_66"]}
29-
glib = {version = "0.15.1", features = ["v2_66"]}
28+
gio = {version = "0.15.1", features = ["v2_66"], git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15"}
29+
glib = {version = "0.15.1", features = ["v2_66"], git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15"}
3030
libc = "0.2"
3131
wayland-client = {version = "0.29", features = ["use_system_lib"], optional = true}
3232
khronos-egl = {version = "4.1.0", optional = true}

gdk4-wayland/sys/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ libc = "0.2"
3535
[dependencies.glib]
3636
package = "glib-sys"
3737
version = "0.15.1"
38+
git = "https://github.com/gtk-rs/gtk-rs-core"
39+
branch = "0.15"
3840

3941
[build-dependencies]
4042
system-deps = "6"

gdk4-x11/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ features = ["dox"]
2424
[dependencies]
2525
ffi = {path = "./sys", package = "gdk4-x11-sys", version = "0.4.1"}
2626
gdk = {path = "../gdk4", package = "gdk4", version = "0.4.1"}
27-
gio = {features = ["v2_66"], version = "0.15.1"}
28-
glib = {features = ["v2_66"], version = "0.15.1"}
27+
gio = {features = ["v2_66"], version = "0.15.1", git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15"}
28+
glib = {features = ["v2_66"], version = "0.15.1", git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15"}
2929
libc = "0.2"
3030
x11 = {version = "2.18", optional = true }
3131
khronos-egl = {version = "4.1.0", optional = true}

gdk4-x11/sys/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ version = "0.4.1"
4040
[dependencies.glib]
4141
package = "glib-sys"
4242
version = "0.15.1"
43+
git = "https://github.com/gtk-rs/gtk-rs-core"
44+
branch = "0.15"
4345

4446
[build-dependencies]
4547
system-deps = "6"

gdk4/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ features = ["dox"]
2626

2727
[dependencies]
2828
bitflags = "1.0"
29-
cairo-rs = "0.15.1"
29+
cairo-rs = {version ="0.15.1", git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15" }
3030
ffi = {package = "gdk4-sys", path = "./sys", version = "0.4.1"}
31-
gdk-pixbuf = "0.15.1"
32-
gio = {version = "0.15.1", features = ["v2_66"]}
33-
glib = {version = "0.15.1", features = ["v2_66"]}
31+
gdk-pixbuf = {version = "0.15.1", git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15" }
32+
gio = {version = "0.15.1", features = ["v2_66"], git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15"}
33+
glib = {version = "0.15.1", features = ["v2_66"], git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15"}
3434
libc = "0.2"
35-
pango = {version = "0.15.1", features = ["v1_46"]}
35+
pango = {version = "0.15.1", features = ["v1_46"], git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15"}
3636

3737
[dev-dependencies]
3838
gir-format-check = "^0.1"

gdk4/sys/Cargo.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,38 @@ libc = "0.2"
4343
[dependencies.cairo]
4444
package = "cairo-sys-rs"
4545
version = "0.15.1"
46+
git = "https://github.com/gtk-rs/gtk-rs-core"
47+
branch = "0.15"
4648

4749
[dependencies.gdk-pixbuf]
4850
package = "gdk-pixbuf-sys"
4951
version = "0.15.1"
52+
git = "https://github.com/gtk-rs/gtk-rs-core"
53+
branch = "0.15"
5054

5155
[dependencies.gio]
5256
package = "gio-sys"
5357
version = "0.15.1"
58+
git = "https://github.com/gtk-rs/gtk-rs-core"
59+
branch = "0.15"
5460

5561
[dependencies.glib]
5662
package = "glib-sys"
5763
version = "0.15.1"
64+
git = "https://github.com/gtk-rs/gtk-rs-core"
65+
branch = "0.15"
5866

5967
[dependencies.gobject]
6068
package = "gobject-sys"
6169
version = "0.15.1"
70+
git = "https://github.com/gtk-rs/gtk-rs-core"
71+
branch = "0.15"
6272

6373
[dependencies.pango]
6474
package = "pango-sys"
6575
version = "0.15.1"
76+
git = "https://github.com/gtk-rs/gtk-rs-core"
77+
branch = "0.15"
6678

6779
[build-dependencies]
6880
system-deps = "6"

gsk4/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ features = ["dox"]
2727

2828
[dependencies]
2929
bitflags = "1.0"
30-
cairo-rs = "0.15.1"
30+
cairo-rs = {version = "0.15.1", git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15" }
3131
ffi = {package = "gsk4-sys", path = "./sys", version = "0.4.1"}
3232
gdk = {package = "gdk4", path = "../gdk4", version = "0.4.1"}
33-
glib = {features = ["v2_66"], version = "0.15.1"}
34-
graphene = {package = "graphene-rs", version = "0.15.1"}
33+
glib = {features = ["v2_66"], version = "0.15.1", git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15"}
34+
graphene = {package = "graphene-rs", version = "0.15.1", git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15"}
3535
libc = "0.2"
36-
pango = {features = ["v1_46"], version = "0.15.1"}
36+
pango = {features = ["v1_46"], version = "0.15.1", git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15"}
3737

3838
[dev-dependencies]
3939
gir-format-check = "^0.1"

gsk4/sys/Cargo.toml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ libc = "0.2"
4343
[dependencies.cairo]
4444
package = "cairo-sys-rs"
4545
version = "0.15.1"
46+
git = "https://github.com/gtk-rs/gtk-rs-core"
47+
branch = "0.15"
4648

4749
[dependencies.gdk]
4850
package = "gdk4-sys"
@@ -52,18 +54,26 @@ version = "0.4.1"
5254
[dependencies.glib]
5355
package = "glib-sys"
5456
version = "0.15.1"
57+
git = "https://github.com/gtk-rs/gtk-rs-core"
58+
branch = "0.15"
5559

5660
[dependencies.gobject]
5761
package = "gobject-sys"
5862
version = "0.15.1"
63+
git = "https://github.com/gtk-rs/gtk-rs-core"
64+
branch = "0.15"
5965

6066
[dependencies.graphene]
6167
package = "graphene-sys"
6268
version = "0.15.1"
69+
git = "https://github.com/gtk-rs/gtk-rs-core"
70+
branch = "0.15"
6371

6472
[dependencies.pango]
6573
package = "pango-sys"
6674
version = "0.15.1"
75+
git = "https://github.com/gtk-rs/gtk-rs-core"
76+
branch = "0.15"
6777

6878
[build-dependencies]
6979
system-deps = "6"

gtk4/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ features = ["dox"]
2727

2828
[dependencies]
2929
bitflags = "1.0"
30-
cairo-rs = "0.15.1"
30+
cairo-rs = {version = "0.15.1", git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15" }
3131
ffi = {package = "gtk4-sys", path = "./sys", version = "0.4.1"}
3232
field-offset = "0.3"
3333
futures-channel = "0.3"
3434
gdk = {package = "gdk4", path = "../gdk4", version = "0.4.1"}
35-
gdk-pixbuf = "0.15.1"
36-
gio = {features = ["v2_66"], version = "0.15.1"}
37-
glib = {features = ["v2_66"], version = "0.15.1"}
38-
graphene = {package = "graphene-rs", version = "0.15.1"}
35+
gdk-pixbuf = {version = "0.15.1", git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15" }
36+
gio = {features = ["v2_66"], version = "0.15.1", git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15"}
37+
glib = {features = ["v2_66"], version = "0.15.1", git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15"}
38+
graphene = {package = "graphene-rs", version = "0.15.1", git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15"}
3939
gsk = {package = "gsk4", path = "../gsk4", version = "0.4.1"}
4040
gtk4-macros = {path = "../gtk4-macros", version = "0.4.1"}
4141
libc = "0.2"
4242
once_cell = "1.0"
43-
pango = {features = ["v1_46"], version = "0.15.1"}
43+
pango = {features = ["v1_46"], version = "0.15.1", git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15"}
4444

4545
[dev-dependencies]
4646
futures-executor = "0.3"

gtk4/sys/Cargo.toml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,14 @@ libc = "0.2"
4444
[dependencies.cairo]
4545
package = "cairo-sys-rs"
4646
version = "0.15.1"
47+
git = "https://github.com/gtk-rs/gtk-rs-core"
48+
branch = "0.15"
4749

4850
[dependencies.gdk-pixbuf]
4951
package = "gdk-pixbuf-sys"
5052
version = "0.15.1"
53+
git = "https://github.com/gtk-rs/gtk-rs-core"
54+
branch = "0.15"
5155

5256
[dependencies.gdk]
5357
package = "gdk4-sys"
@@ -57,18 +61,26 @@ version = "0.4.1"
5761
[dependencies.gio]
5862
package = "gio-sys"
5963
version = "0.15.1"
64+
git = "https://github.com/gtk-rs/gtk-rs-core"
65+
branch = "0.15"
6066

6167
[dependencies.glib]
6268
package = "glib-sys"
6369
version = "0.15.1"
70+
git = "https://github.com/gtk-rs/gtk-rs-core"
71+
branch = "0.15"
6472

6573
[dependencies.gobject]
6674
package = "gobject-sys"
6775
version = "0.15.1"
76+
git = "https://github.com/gtk-rs/gtk-rs-core"
77+
branch = "0.15"
6878

6979
[dependencies.graphene]
7080
package = "graphene-sys"
7181
version = "0.15.1"
82+
git = "https://github.com/gtk-rs/gtk-rs-core"
83+
branch = "0.15"
7284

7385
[dependencies.gsk]
7486
package = "gsk4-sys"
@@ -78,6 +90,8 @@ version = "0.4.1"
7890
[dependencies.pango]
7991
package = "pango-sys"
8092
version = "0.15.1"
93+
git = "https://github.com/gtk-rs/gtk-rs-core"
94+
branch = "0.15"
8195

8296
[build-dependencies]
8397
system-deps = "6"

0 commit comments

Comments
 (0)