Skip to content

Automated PR: Changes from updating gir/gir-files #2032

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 7 commits into from
Apr 26, 2025
Merged

Automated PR: Changes from updating gir/gir-files #2032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b0f1d17
Update gir
github-actions[bot] Apr 25, 2025
9ff6472
Regenerate with latest gir
github-actions[bot] Apr 25, 2025
8b30882
Update gir-files
github-actions[bot] Apr 25, 2025
2e5530c
Regenerate with latest gir-files
github-actions[bot] Apr 25, 2025
33885fa
Generate new 4.20 types
bilelmoussaoui Apr 26, 2025
232b464
gdk: Export v4.20 feature
bilelmoussaoui Apr 26, 2025
ce45b4a
ci: Test v4.20
bilelmoussaoui Apr 26, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ jobs:
conf:
- {
name: "gtk4",
features: "v4_18,xml_validation,blueprint",
features: "v4_20,xml_validation,blueprint",
test_sys: false,
}
- { name: "gsk4", features: "v4_18,broadway,vulkan", test_sys: true }
- { name: "gdk4", features: "v4_18,gl", test_sys: true }
- { name: "gdk4", features: "v4_20,gl", test_sys: true }
- {
name: "gdk4-wayland",
features: "v4_18,wayland_crate,egl",
Expand Down
4 changes: 2 additions & 2 deletions gdk4-macos/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 @ 491114ad76bd)
from gir-files (https://github.com/gtk-rs/gir-files @ 56728a5eb215)
Generated by gir (https://github.com/gtk-rs/gir @ 13192296259b)
from gir-files (https://github.com/gtk-rs/gir-files @ 6668d0f5551a)
4 changes: 2 additions & 2 deletions gdk4-macos/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 @ 491114ad76bd)
from gir-files (https://github.com/gtk-rs/gir-files @ 56728a5eb215)
Generated by gir (https://github.com/gtk-rs/gir @ 13192296259b)
from gir-files (https://github.com/gtk-rs/gir-files @ 6668d0f5551a)
4 changes: 2 additions & 2 deletions 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 @ 491114ad76bd)
from gir-files (https://github.com/gtk-rs/gir-files @ 56728a5eb215)
Generated by gir (https://github.com/gtk-rs/gir @ 13192296259b)
from gir-files (https://github.com/gtk-rs/gir-files @ 6668d0f5551a)
4 changes: 2 additions & 2 deletions 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 @ 491114ad76bd)
from gir-files (https://github.com/gtk-rs/gir-files @ 56728a5eb215)
Generated by gir (https://github.com/gtk-rs/gir @ 13192296259b)
from gir-files (https://github.com/gtk-rs/gir-files @ 6668d0f5551a)
4 changes: 2 additions & 2 deletions 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 @ 491114ad76bd)
from gir-files (https://github.com/gtk-rs/gir-files @ 56728a5eb215)
Generated by gir (https://github.com/gtk-rs/gir @ 13192296259b)
from gir-files (https://github.com/gtk-rs/gir-files @ 6668d0f5551a)
4 changes: 2 additions & 2 deletions 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 @ 491114ad76bd)
from gir-files (https://github.com/gtk-rs/gir-files @ 56728a5eb215)
Generated by gir (https://github.com/gtk-rs/gir @ 13192296259b)
from gir-files (https://github.com/gtk-rs/gir-files @ 6668d0f5551a)
4 changes: 2 additions & 2 deletions 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 @ 491114ad76bd)
from gir-files (https://github.com/gtk-rs/gir-files @ 56728a5eb215)
Generated by gir (https://github.com/gtk-rs/gir @ 13192296259b)
from gir-files (https://github.com/gtk-rs/gir-files @ 6668d0f5551a)
4 changes: 2 additions & 2 deletions 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 @ 491114ad76bd)
from gir-files (https://github.com/gtk-rs/gir-files @ 56728a5eb215)
Generated by gir (https://github.com/gtk-rs/gir @ 13192296259b)
from gir-files (https://github.com/gtk-rs/gir-files @ 6668d0f5551a)
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 @@ -26,6 +26,7 @@ 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"]
v4_20 = ["gdk4-sys/v4_20", "v4_18"]
gl = ["dep:gl"]

[dependencies]
Expand Down
5 changes: 3 additions & 2 deletions gdk4/Gir.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ generate = [
"Gdk.TextureDownloader",
"Gdk.TextureError",
"Gdk.TitlebarGesture",
"Gdk.ToplevelCapabilities",
"Gdk.ToplevelLayout",
"Gdk.TouchEvent",
"Gdk.TouchpadEvent",
Expand Down Expand Up @@ -144,11 +145,11 @@ status = "generate"
[[object.function]]
name = "pango_layout_get_clip_region"
manual = true
doc_ignore_parameters = ["n_ranges"]
doc_ignore_parameters = ["n_ranges"]
[[object.function]]
name = "pango_layout_line_get_clip_region"
manual = true
doc_ignore_parameters = ["n_ranges"]
doc_ignore_parameters = ["n_ranges"]
[[object.function]]
name = "content_register_deserializer"
manual = true
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_20 | Enable the new APIs part of GTK 4.20 |
| `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 |
Expand Down
184 changes: 184 additions & 0 deletions gdk4/src/auto/enums.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1737,6 +1737,98 @@ pub enum MemoryFormat {
#[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))]
#[doc(alias = "GDK_MEMORY_X8B8G8R8")]
X8b8g8r8,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_B8R8_420")]
G8B8r8420,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_R8B8_420")]
G8R8b8420,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_B8R8_422")]
G8B8r8422,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_R8B8_422")]
G8R8b8422,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_B8R8_444")]
G8B8r8444,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_R8B8_444")]
G8R8b8444,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G10X6_B10X6R10X6_420")]
G10x6B10x6r10x6420,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G12X4_B12X4R12X4_420")]
G12x4B12x4r12x4420,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G16_B16R16_420")]
G16B16r16420,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_B8_R8_410")]
G8B8R8410,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_R8_B8_410")]
G8R8B8410,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_B8_R8_411")]
G8B8R8411,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_R8_B8_411")]
G8R8B8411,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_B8_R8_420")]
G8B8R8420,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_R8_B8_420")]
G8R8B8420,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_B8_R8_422")]
G8B8R8422,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_R8_B8_422")]
G8R8B8422,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_B8_R8_444")]
G8B8R8444,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8_R8_B8_444")]
G8R8B8444,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8B8G8R8_422")]
G8b8g8r8422,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_G8R8G8B8_422")]
G8r8g8b8422,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_R8G8B8G8_422")]
R8g8b8g8422,
#[cfg(feature = "v4_20")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
#[doc(alias = "GDK_MEMORY_B8G8R8G8_422")]
B8g8r8g8422,
#[doc(hidden)]
__Unknown(i32),
}
Expand Down Expand Up @@ -1808,6 +1900,52 @@ impl IntoGlib for MemoryFormat {
Self::R8g8b8x8 => ffi::GDK_MEMORY_R8G8B8X8,
#[cfg(feature = "v4_14")]
Self::X8b8g8r8 => ffi::GDK_MEMORY_X8B8G8R8,
#[cfg(feature = "v4_20")]
Self::G8B8r8420 => ffi::GDK_MEMORY_G8_B8R8_420,
#[cfg(feature = "v4_20")]
Self::G8R8b8420 => ffi::GDK_MEMORY_G8_R8B8_420,
#[cfg(feature = "v4_20")]
Self::G8B8r8422 => ffi::GDK_MEMORY_G8_B8R8_422,
#[cfg(feature = "v4_20")]
Self::G8R8b8422 => ffi::GDK_MEMORY_G8_R8B8_422,
#[cfg(feature = "v4_20")]
Self::G8B8r8444 => ffi::GDK_MEMORY_G8_B8R8_444,
#[cfg(feature = "v4_20")]
Self::G8R8b8444 => ffi::GDK_MEMORY_G8_R8B8_444,
#[cfg(feature = "v4_20")]
Self::G10x6B10x6r10x6420 => ffi::GDK_MEMORY_G10X6_B10X6R10X6_420,
#[cfg(feature = "v4_20")]
Self::G12x4B12x4r12x4420 => ffi::GDK_MEMORY_G12X4_B12X4R12X4_420,
#[cfg(feature = "v4_20")]
Self::G16B16r16420 => ffi::GDK_MEMORY_G16_B16R16_420,
#[cfg(feature = "v4_20")]
Self::G8B8R8410 => ffi::GDK_MEMORY_G8_B8_R8_410,
#[cfg(feature = "v4_20")]
Self::G8R8B8410 => ffi::GDK_MEMORY_G8_R8_B8_410,
#[cfg(feature = "v4_20")]
Self::G8B8R8411 => ffi::GDK_MEMORY_G8_B8_R8_411,
#[cfg(feature = "v4_20")]
Self::G8R8B8411 => ffi::GDK_MEMORY_G8_R8_B8_411,
#[cfg(feature = "v4_20")]
Self::G8B8R8420 => ffi::GDK_MEMORY_G8_B8_R8_420,
#[cfg(feature = "v4_20")]
Self::G8R8B8420 => ffi::GDK_MEMORY_G8_R8_B8_420,
#[cfg(feature = "v4_20")]
Self::G8B8R8422 => ffi::GDK_MEMORY_G8_B8_R8_422,
#[cfg(feature = "v4_20")]
Self::G8R8B8422 => ffi::GDK_MEMORY_G8_R8_B8_422,
#[cfg(feature = "v4_20")]
Self::G8B8R8444 => ffi::GDK_MEMORY_G8_B8_R8_444,
#[cfg(feature = "v4_20")]
Self::G8R8B8444 => ffi::GDK_MEMORY_G8_R8_B8_444,
#[cfg(feature = "v4_20")]
Self::G8b8g8r8422 => ffi::GDK_MEMORY_G8B8G8R8_422,
#[cfg(feature = "v4_20")]
Self::G8r8g8b8422 => ffi::GDK_MEMORY_G8R8G8B8_422,
#[cfg(feature = "v4_20")]
Self::R8g8b8g8422 => ffi::GDK_MEMORY_R8G8B8G8_422,
#[cfg(feature = "v4_20")]
Self::B8g8r8g8422 => ffi::GDK_MEMORY_B8G8R8G8_422,
Self::__Unknown(value) => value,
}
}
Expand Down Expand Up @@ -1880,6 +2018,52 @@ impl FromGlib<ffi::GdkMemoryFormat> for MemoryFormat {
ffi::GDK_MEMORY_R8G8B8X8 => Self::R8g8b8x8,
#[cfg(feature = "v4_14")]
ffi::GDK_MEMORY_X8B8G8R8 => Self::X8b8g8r8,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_B8R8_420 => Self::G8B8r8420,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_R8B8_420 => Self::G8R8b8420,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_B8R8_422 => Self::G8B8r8422,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_R8B8_422 => Self::G8R8b8422,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_B8R8_444 => Self::G8B8r8444,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_R8B8_444 => Self::G8R8b8444,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G10X6_B10X6R10X6_420 => Self::G10x6B10x6r10x6420,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G12X4_B12X4R12X4_420 => Self::G12x4B12x4r12x4420,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G16_B16R16_420 => Self::G16B16r16420,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_B8_R8_410 => Self::G8B8R8410,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_R8_B8_410 => Self::G8R8B8410,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_B8_R8_411 => Self::G8B8R8411,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_R8_B8_411 => Self::G8R8B8411,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_B8_R8_420 => Self::G8B8R8420,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_R8_B8_420 => Self::G8R8B8420,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_B8_R8_422 => Self::G8B8R8422,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_R8_B8_422 => Self::G8R8B8422,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_B8_R8_444 => Self::G8B8R8444,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8_R8_B8_444 => Self::G8R8B8444,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8B8G8R8_422 => Self::G8b8g8r8422,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_G8R8G8B8_422 => Self::G8r8g8b8422,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_R8G8B8G8_422 => Self::R8g8b8g8422,
#[cfg(feature = "v4_20")]
ffi::GDK_MEMORY_B8G8R8G8_422 => Self::B8g8r8g8422,
value => Self::__Unknown(value),
}
}
Expand Down
Loading
Loading