Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regen with ffi workspacecs usage #1587

Merged
merged 3 commits into from
Feb 1, 2024
Merged

Regen with ffi workspacecs usage #1587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95e8efc
Update gir submodule
bilelmoussaoui Feb 1, 2024
e3b304d
Regenerate with latest gir
bilelmoussaoui Feb 1, 2024
b7fb460
Use cargo workspace features for ffi
bilelmoussaoui Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion Cargo.toml
View file
Open in desktop
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" }
2 changes: 1 addition & 1 deletion gdk4-wayland/src/auto/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
Generated by gir (https://github.com/gtk-rs/gir @ 9ebc44374393)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
6 changes: 2 additions & 4 deletions gdk4-wayland/sys/Cargo.toml
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions gdk4-wayland/sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
)]
#![cfg_attr(docsrs, feature(doc_cfg))]

use glib_sys as glib;

#[allow(unused_imports)]
use libc::{
c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
Expand Down
2 changes: 1 addition & 1 deletion gdk4-wayland/sys/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
Generated by gir (https://github.com/gtk-rs/gir @ 9ebc44374393)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
2 changes: 1 addition & 1 deletion gdk4-win32/src/auto/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
Generated by gir (https://github.com/gtk-rs/gir @ 9ebc44374393)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
14 changes: 5 additions & 9 deletions gdk4-win32/sys/Cargo.toml
View file
Open in desktop
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
3 changes: 3 additions & 0 deletions gdk4-win32/sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
)]
#![cfg_attr(docsrs, feature(doc_cfg))]

use gdk4_sys as gdk;
use glib_sys as glib;

#[allow(unused_imports)]
use libc::{
c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
Expand Down
2 changes: 1 addition & 1 deletion gdk4-win32/sys/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
Generated by gir (https://github.com/gtk-rs/gir @ 9ebc44374393)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
2 changes: 1 addition & 1 deletion gdk4-x11/src/auto/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
Generated by gir (https://github.com/gtk-rs/gir @ 9ebc44374393)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
14 changes: 5 additions & 9 deletions gdk4-x11/sys/Cargo.toml
View file
Open in desktop
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
3 changes: 3 additions & 0 deletions gdk4-x11/sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
)]
#![cfg_attr(docsrs, feature(doc_cfg))]

use gdk4_sys as gdk;
use glib_sys as glib;

#[allow(unused_imports)]
use libc::{
c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
Expand Down
2 changes: 1 addition & 1 deletion gdk4-x11/sys/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
Generated by gir (https://github.com/gtk-rs/gir @ 9ebc44374393)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
2 changes: 1 addition & 1 deletion gdk4/src/auto/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
Generated by gir (https://github.com/gtk-rs/gir @ 9ebc44374393)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
46 changes: 17 additions & 29 deletions gdk4/sys/Cargo.toml
View file
Open in desktop
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
7 changes: 7 additions & 0 deletions gdk4/sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@
)]
#![cfg_attr(docsrs, feature(doc_cfg))]

use cairo_sys as cairo;
use gdk_pixbuf_sys as gdk_pixbuf;
use gio_sys as gio;
use glib_sys as glib;
use gobject_sys as gobject;
use pango_sys as pango;

#[allow(unused_imports)]
use libc::{
c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
Expand Down
2 changes: 1 addition & 1 deletion gdk4/sys/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
Generated by gir (https://github.com/gtk-rs/gir @ 9ebc44374393)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
2 changes: 1 addition & 1 deletion gir
Open in desktop
Submodule gir updated 2 files
+1 −2 src/codegen/sys/cargo_toml.rs
+16 −0 src/codegen/sys/lib_.rs
2 changes: 1 addition & 1 deletion gsk4/src/auto/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
Generated by gir (https://github.com/gtk-rs/gir @ 9ebc44374393)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
46 changes: 17 additions & 29 deletions gsk4/sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,35 +68,23 @@ 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.graphene-sys]
workspace = true

[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
7 changes: 7 additions & 0 deletions gsk4/sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@
)]
#![cfg_attr(docsrs, feature(doc_cfg))]

use cairo_sys as cairo;
use gdk4_sys as gdk;
use glib_sys as glib;
use gobject_sys as gobject;
use graphene_sys as graphene;
use pango_sys as pango;

#[allow(unused_imports)]
use libc::{
c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
Expand Down
2 changes: 1 addition & 1 deletion gsk4/sys/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
Generated by gir (https://github.com/gtk-rs/gir @ 9ebc44374393)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
2 changes: 1 addition & 1 deletion gtk4/src/auto/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
Generated by gir (https://github.com/gtk-rs/gir @ 9ebc44374393)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
70 changes: 26 additions & 44 deletions gtk4/sys/Cargo.toml
View file
Open in desktop
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
10 changes: 10 additions & 0 deletions gtk4/sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@
)]
#![cfg_attr(docsrs, feature(doc_cfg))]

use cairo_sys as cairo;
use gdk4_sys as gdk;
use gdk_pixbuf_sys as gdk_pixbuf;
use gio_sys as gio;
use glib_sys as glib;
use gobject_sys as gobject;
use graphene_sys as graphene;
use gsk4_sys as gsk;
use pango_sys as pango;

#[allow(unused_imports)]
use libc::{
c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
Expand Down
2 changes: 1 addition & 1 deletion gtk4/sys/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 68044d02c2a3)
Generated by gir (https://github.com/gtk-rs/gir @ 9ebc44374393)
from gir-files (https://github.com/gtk-rs/gir-files @ 4d83970797d4)
Loading