From 05c706b40ff562db4c8ac19f724e254333a539c1 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Mon, 11 Nov 2024 12:00:46 +0100 Subject: [PATCH 1/3] Update gir-files --- gir-files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gir-files b/gir-files index f7af0e711383..3e07ae5a14c7 160000 --- a/gir-files +++ b/gir-files @@ -1 +1 @@ -Subproject commit f7af0e711383fefe8ab73b139dfa165dbbc76d4c +Subproject commit 3e07ae5a14c7ae05333e0fcdcc5a5e668d74a710 From 70c05364c32ae70c0f6394fecd175548e40f6109 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Mon, 11 Nov 2024 12:04:36 +0100 Subject: [PATCH 2/3] Regenerate with latest gir-files --- gdk4-wayland/src/auto/versions.txt | 2 +- gdk4-wayland/sys/versions.txt | 2 +- gdk4-win32/src/auto/versions.txt | 2 +- gdk4-win32/sys/versions.txt | 2 +- gdk4-x11/src/auto/versions.txt | 2 +- gdk4-x11/sys/versions.txt | 2 +- gdk4/src/auto/color_state.rs | 4 ++++ gdk4/src/auto/versions.txt | 2 +- gdk4/sys/Cargo.toml | 4 ++++ gdk4/sys/build_version.rs | 4 +++- gdk4/sys/src/lib.rs | 8 ++++---- gdk4/sys/versions.txt | 2 +- gsk4/src/auto/versions.txt | 2 +- gsk4/sys/versions.txt | 2 +- gtk4/src/auto/versions.txt | 2 +- gtk4/sys/versions.txt | 2 +- 16 files changed, 27 insertions(+), 17 deletions(-) diff --git a/gdk4-wayland/src/auto/versions.txt b/gdk4-wayland/src/auto/versions.txt index 9cb1c033d627..d9d8881f68ee 100644 --- a/gdk4-wayland/src/auto/versions.txt +++ b/gdk4-wayland/src/auto/versions.txt @@ -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) diff --git a/gdk4-wayland/sys/versions.txt b/gdk4-wayland/sys/versions.txt index 9cb1c033d627..d9d8881f68ee 100644 --- a/gdk4-wayland/sys/versions.txt +++ b/gdk4-wayland/sys/versions.txt @@ -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) diff --git a/gdk4-win32/src/auto/versions.txt b/gdk4-win32/src/auto/versions.txt index 9cb1c033d627..d9d8881f68ee 100644 --- a/gdk4-win32/src/auto/versions.txt +++ b/gdk4-win32/src/auto/versions.txt @@ -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) diff --git a/gdk4-win32/sys/versions.txt b/gdk4-win32/sys/versions.txt index 9cb1c033d627..d9d8881f68ee 100644 --- a/gdk4-win32/sys/versions.txt +++ b/gdk4-win32/sys/versions.txt @@ -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) diff --git a/gdk4-x11/src/auto/versions.txt b/gdk4-x11/src/auto/versions.txt index 9cb1c033d627..d9d8881f68ee 100644 --- a/gdk4-x11/src/auto/versions.txt +++ b/gdk4-x11/src/auto/versions.txt @@ -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) diff --git a/gdk4-x11/sys/versions.txt b/gdk4-x11/sys/versions.txt index 9cb1c033d627..d9d8881f68ee 100644 --- a/gdk4-x11/sys/versions.txt +++ b/gdk4-x11/sys/versions.txt @@ -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) diff --git a/gdk4/src/auto/color_state.rs b/gdk4/src/auto/color_state.rs index 0f10dbd1e724..138a926bbe69 100644 --- a/gdk4/src/auto/color_state.rs +++ b/gdk4/src/auto/color_state.rs @@ -36,6 +36,8 @@ 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 { @@ -43,6 +45,8 @@ impl ColorState { 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 { diff --git a/gdk4/src/auto/versions.txt b/gdk4/src/auto/versions.txt index 9cb1c033d627..d9d8881f68ee 100644 --- a/gdk4/src/auto/versions.txt +++ b/gdk4/src/auto/versions.txt @@ -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) diff --git a/gdk4/sys/Cargo.toml b/gdk4/sys/Cargo.toml index 5aea888acac1..389a5d6da727 100644 --- a/gdk4/sys/Cargo.toml +++ b/gdk4/sys/Cargo.toml @@ -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.18" + [package.metadata.docs.rs] rustc-args = ["--cfg", "docsrs"] rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"] @@ -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" diff --git a/gdk4/sys/build_version.rs b/gdk4/sys/build_version.rs index 203c6fe48489..5e1ee35cfc21 100644 --- a/gdk4/sys/build_version.rs +++ b/gdk4/sys/build_version.rs @@ -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" diff --git a/gdk4/sys/src/lib.rs b/gdk4/sys/src/lib.rs index e023eb5ac9d5..df07ed285c69 100644 --- a/gdk4/sys/src/lib.rs +++ b/gdk4/sys/src/lib.rs @@ -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")))] diff --git a/gdk4/sys/versions.txt b/gdk4/sys/versions.txt index 9cb1c033d627..d9d8881f68ee 100644 --- a/gdk4/sys/versions.txt +++ b/gdk4/sys/versions.txt @@ -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) diff --git a/gsk4/src/auto/versions.txt b/gsk4/src/auto/versions.txt index 9cb1c033d627..d9d8881f68ee 100644 --- a/gsk4/src/auto/versions.txt +++ b/gsk4/src/auto/versions.txt @@ -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) diff --git a/gsk4/sys/versions.txt b/gsk4/sys/versions.txt index 9cb1c033d627..d9d8881f68ee 100644 --- a/gsk4/sys/versions.txt +++ b/gsk4/sys/versions.txt @@ -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) diff --git a/gtk4/src/auto/versions.txt b/gtk4/src/auto/versions.txt index 9cb1c033d627..d9d8881f68ee 100644 --- a/gtk4/src/auto/versions.txt +++ b/gtk4/src/auto/versions.txt @@ -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) diff --git a/gtk4/sys/versions.txt b/gtk4/sys/versions.txt index 9cb1c033d627..d9d8881f68ee 100644 --- a/gtk4/sys/versions.txt +++ b/gtk4/sys/versions.txt @@ -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) From 200585eb32cc8c6b0d9ad95f43254e159a031b53 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Mon, 11 Nov 2024 12:07:00 +0100 Subject: [PATCH 3/3] gdk: Export v4.18 feature --- gdk4/Cargo.toml | 1 + gdk4/README.md | 1 + gdk4/sys/Cargo.toml | 2 +- gtk4/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gdk4/Cargo.toml b/gdk4/Cargo.toml index be2970479f5b..b3d226235cc0 100644 --- a/gdk4/Cargo.toml +++ b/gdk4/Cargo.toml @@ -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] diff --git a/gdk4/README.md b/gdk4/README.md index 6e0e9b1bc441..045355b47efa 100644 --- a/gdk4/README.md +++ b/gdk4/README.md @@ -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 | diff --git a/gdk4/sys/Cargo.toml b/gdk4/sys/Cargo.toml index 389a5d6da727..efb330844361 100644 --- a/gdk4/sys/Cargo.toml +++ b/gdk4/sys/Cargo.toml @@ -58,7 +58,7 @@ version = "4.14" version = "4.16" [package.metadata.system-deps.gtk4.v4_18] -version = "4.18" +version = "4.17" [package.metadata.docs.rs] rustc-args = ["--cfg", "docsrs"] diff --git a/gtk4/Cargo.toml b/gtk4/Cargo.toml index f84d0048bda9..c508e4799ccb 100644 --- a/gtk4/Cargo.toml +++ b/gtk4/Cargo.toml @@ -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"]