Skip to content

Update gir files #1907

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

Merged
merged 3 commits into from
Nov 11, 2024
Merged

Update gir files #1907

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
05c706b
Update gir-files
bilelmoussaoui Nov 11, 2024
70c0536
Regenerate with latest gir-files
bilelmoussaoui Nov 11, 2024
200585e
gdk: Export v4.18 feature
bilelmoussaoui Nov 11, 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
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 @ e5ad53c3ad05)
from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
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 @ e5ad53c3ad05)
from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
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 @ e5ad53c3ad05)
from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
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 @ e5ad53c3ad05)
from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
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 @ e5ad53c3ad05)
from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
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 @ e5ad53c3ad05)
from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
1 change: 1 addition & 0 deletions gdk4/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ v4_10 = ["gdk4-sys/v4_10", "v4_8"]
v4_12 = ["gdk4-sys/v4_12", "v4_10"]
v4_14 = ["gdk4-sys/v4_14", "v4_12"]
v4_16 = ["gdk4-sys/v4_16", "v4_14"]
v4_18 = ["gdk4-sys/v4_18", "v4_16"]
gl = ["dep:gl"]

[dependencies]
Expand Down
1 change: 1 addition & 0 deletions gdk4/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ gdk = { git = "https://github.com/gtk-rs/gtk4-rs.git", package = "gdk4" }

| Feature | Description |
| --- | ----------- |
| `v4_18` | Enable the new APIs part of GTK 4.18 |
| `v4_16` | Enable the new APIs part of GTK 4.16 |
| `v4_14` | Enable the new APIs part of GTK 4.14 |
| `v4_12` | Enable the new APIs part of GTK 4.12 |
Expand Down
4 changes: 4 additions & 0 deletions gdk4/src/auto/color_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,17 @@ impl ColorState {
}
}

#[cfg(feature = "v4_18")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_18")))]
#[doc(alias = "gdk_color_state_get_oklab")]
#[doc(alias = "get_oklab")]
pub fn oklab() -> ColorState {
assert_initialized_main_thread!();
unsafe { from_glib_full(ffi::gdk_color_state_get_oklab()) }
}

#[cfg(feature = "v4_18")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_18")))]
#[doc(alias = "gdk_color_state_get_oklch")]
#[doc(alias = "get_oklch")]
pub fn oklch() -> ColorState {
Expand Down
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 @ e5ad53c3ad05)
from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
4 changes: 4 additions & 0 deletions gdk4/sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ version = "4.14"
[package.metadata.system-deps.gtk4.v4_16]
version = "4.16"

[package.metadata.system-deps.gtk4.v4_18]
version = "4.17"

[package.metadata.docs.rs]
rustc-args = ["--cfg", "docsrs"]
rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
Expand All @@ -74,6 +77,7 @@ v4_10 = ["v4_8"]
v4_12 = ["v4_10"]
v4_14 = ["v4_12"]
v4_16 = ["v4_14"]
v4_18 = ["v4_16"]

[dependencies]
libc = "0.2"
Expand Down
4 changes: 3 additions & 1 deletion gdk4/sys/build_version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
// DO NOT EDIT

pub fn version() -> &'static str {
if cfg!(feature = "v4_16") {
if cfg!(feature = "v4_18") {
"4.18"
} else if cfg!(feature = "v4_16") {
"4.16"
} else if cfg!(feature = "v4_14") {
"4.14"
Expand Down
8 changes: 4 additions & 4 deletions gdk4/sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4036,11 +4036,11 @@ extern "C" {
#[cfg(feature = "v4_16")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_16")))]
pub fn gdk_color_state_unref(self_: *mut GdkColorState);
#[cfg(feature = "v4_16")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_16")))]
#[cfg(feature = "v4_18")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_18")))]
pub fn gdk_color_state_get_oklab() -> *mut GdkColorState;
#[cfg(feature = "v4_16")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_16")))]
#[cfg(feature = "v4_18")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_18")))]
pub fn gdk_color_state_get_oklch() -> *mut GdkColorState;
#[cfg(feature = "v4_16")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_16")))]
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 @ e5ad53c3ad05)
from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
2 changes: 1 addition & 1 deletion gir-files
Open in desktop
Submodule gir-files updated 5 files
+360 −301 GLib-2.0.gir
+14 −9 GObject-2.0.gir
+22 −4 Gdk-4.0.gir
+434 −30 Gio-2.0.gir
+643 −25 GioUnix-2.0.gir
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 @ e5ad53c3ad05)
from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
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 @ e5ad53c3ad05)
from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
2 changes: 1 addition & 1 deletion gtk4/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ v4_10 = ["gtk4-sys/v4_10", "v4_8", "gdk/v4_10", "gsk/v4_10"]
v4_12 = ["gtk4-sys/v4_12", "v4_10", "gdk/v4_12"]
v4_14 = ["gtk4-sys/v4_14", "v4_12", "gdk/v4_14", "gsk/v4_14"]
v4_16 = ["gtk4-sys/v4_16", "v4_14", "gdk/v4_16", "gsk/v4_16"]
v4_18 = ["gtk4-sys/v4_18", "v4_16"]
v4_18 = ["gtk4-sys/v4_18", "gdk/v4_18", "v4_16"]
gio_v2_80 = ["gio/v2_80"]
xml_validation = ["gtk4-macros/xml_validation"]
blueprint = ["gtk4-macros/blueprint"]
Expand Down
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 @ e5ad53c3ad05)
from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
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 @ e5ad53c3ad05)
from gir-files (https://github.com/gtk-rs/gir-files @ f7af0e711383)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
Loading