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

Jump to bottom

Update gir files #1576

Merged
merged 9 commits into from
Dec 1, 2024
Merged

Update gir files #1576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
90ba4a2
Update gir
sdroege Nov 22, 2024
4f27db9
Update gir-files
sdroege Nov 22, 2024
7294553
Regenerate with latest gir / gir-files
sdroege Nov 22, 2024
dd71b39
ci: Check pango 1.56 feature on the CI
sdroege Nov 22, 2024
6330e65
pango: Update C library version requirements
sdroege Nov 22, 2024
1cf4236
Update Cargo.lock
sdroege Nov 22, 2024
10b8df4
deny: Update unicode license name
sdroege Nov 22, 2024
a8568b6
Update gir-files
sdroege Dec 1, 2024
8e04138
Regenerate with latest gir-files
sdroege Dec 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
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- { name: "gio", features: "v2_84", nightly: "--all-features", test_sys: true }
- { name: "glib", features: "v2_84,log", nightly: "--all-features", test_sys: true }
- { name: "graphene", features: "", nightly: "", test_sys: true }
- { name: "pango", features: "v1_54", nightly: "--all-features", test_sys: true }
- { name: "pango", features: "v1_56", nightly: "--all-features", test_sys: true }
- { name: "pangocairo", features: "", nightly: "--all-features", test_sys: true }
steps:
- uses: actions/checkout@v4
Expand Down
68 changes: 34 additions & 34 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ allow = [
"MIT",
"Apache-2.0",
"Apache-2.0 WITH LLVM-exception",
"Unicode-DFS-2016",
"Unicode-3.0",
]
confidence-threshold = 0.8

Expand Down
4 changes: 2 additions & 2 deletions gdk-pixbuf/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 @ 25fc925cd3da)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
Generated by gir (https://github.com/gtk-rs/gir @ 1b34ebba86cb)
from gir-files (https://github.com/gtk-rs/gir-files @ dfdf5ed146d5)
4 changes: 2 additions & 2 deletions gdk-pixbuf/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 @ 25fc925cd3da)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
Generated by gir (https://github.com/gtk-rs/gir @ 1b34ebba86cb)
from gir-files (https://github.com/gtk-rs/gir-files @ dfdf5ed146d5)
4 changes: 2 additions & 2 deletions gio/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 @ 25fc925cd3da)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
Generated by gir (https://github.com/gtk-rs/gir @ 1b34ebba86cb)
from gir-files (https://github.com/gtk-rs/gir-files @ dfdf5ed146d5)
4 changes: 2 additions & 2 deletions gio/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 @ 25fc925cd3da)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
Generated by gir (https://github.com/gtk-rs/gir @ 1b34ebba86cb)
from gir-files (https://github.com/gtk-rs/gir-files @ dfdf5ed146d5)
2 changes: 1 addition & 1 deletion gir
Open in desktop
Submodule gir updated 2 files
+11 −3 src/codegen/function_body_chunk.rs
+27 −5 src/codegen/trait_impls.rs
2 changes: 1 addition & 1 deletion gir-files
Open in desktop
Submodule gir-files updated 8 files
+0 −6 .github/workflows/CI.yml
+4 −1 .github/workflows/regenerate_scheduled.yml
+584 −478 GLib-2.0.gir
+28 −17 Gdk-4.0.gir
+164 −0 GdkMacos-4.0.gir
+1,688 −1,652 Gtk-4.0.gir
+23 −2 Pango-1.0.gir
+108 −0 dl-gtk-macos.py
4 changes: 2 additions & 2 deletions glib/gobject-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 @ 25fc925cd3da)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
Generated by gir (https://github.com/gtk-rs/gir @ 1b34ebba86cb)
from gir-files (https://github.com/gtk-rs/gir-files @ dfdf5ed146d5)
10 changes: 10 additions & 0 deletions glib/src/auto/constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,16 @@ pub static STR_DELIMITERS: &GStr =
#[doc(alias = "G_TEST_OPTION_ISOLATE_DIRS")]
pub static TEST_OPTION_ISOLATE_DIRS: &GStr =
unsafe { GStr::from_utf8_with_nul_unchecked(ffi::G_TEST_OPTION_ISOLATE_DIRS) };
#[cfg(feature = "v2_84")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))]
#[doc(alias = "G_TEST_OPTION_NONFATAL_ASSERTIONS")]
pub static TEST_OPTION_NONFATAL_ASSERTIONS: &GStr =
unsafe { GStr::from_utf8_with_nul_unchecked(ffi::G_TEST_OPTION_NONFATAL_ASSERTIONS) };
#[cfg(feature = "v2_84")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))]
#[doc(alias = "G_TEST_OPTION_NO_PRGNAME")]
pub static TEST_OPTION_NO_PRGNAME: &GStr =
unsafe { GStr::from_utf8_with_nul_unchecked(ffi::G_TEST_OPTION_NO_PRGNAME) };
#[doc(alias = "G_URI_RESERVED_CHARS_GENERIC_DELIMITERS")]
pub static URI_RESERVED_CHARS_GENERIC_DELIMITERS: &GStr =
unsafe { GStr::from_utf8_with_nul_unchecked(ffi::G_URI_RESERVED_CHARS_GENERIC_DELIMITERS) };
Expand Down
6 changes: 6 additions & 0 deletions glib/src/auto/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,5 +124,11 @@ pub use self::constants::STR_DELIMITERS;
#[cfg(feature = "v2_60")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_60")))]
pub use self::constants::TEST_OPTION_ISOLATE_DIRS;
#[cfg(feature = "v2_84")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))]
pub use self::constants::TEST_OPTION_NONFATAL_ASSERTIONS;
#[cfg(feature = "v2_84")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))]
pub use self::constants::TEST_OPTION_NO_PRGNAME;
pub use self::constants::URI_RESERVED_CHARS_GENERIC_DELIMITERS;
pub use self::constants::URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS;
4 changes: 2 additions & 2 deletions glib/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 @ 25fc925cd3da)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
Generated by gir (https://github.com/gtk-rs/gir @ 1b34ebba86cb)
from gir-files (https://github.com/gtk-rs/gir-files @ dfdf5ed146d5)
2 changes: 2 additions & 0 deletions glib/sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,8 @@ pub const GLIB_SYSDEF_MSG_DONTROUTE: c_int = 4;
pub const GLIB_SYSDEF_MSG_OOB: c_int = 1;
pub const GLIB_SYSDEF_MSG_PEEK: c_int = 2;
pub const G_TEST_OPTION_ISOLATE_DIRS: &[u8] = b"isolate_dirs\0";
pub const G_TEST_OPTION_NONFATAL_ASSERTIONS: &[u8] = b"nonfatal-assertions\0";
pub const G_TEST_OPTION_NO_PRGNAME: &[u8] = b"no_g_set_prgname\0";
pub const G_TIME_SPAN_DAY: i64 = 86400000000;
pub const G_TIME_SPAN_HOUR: i64 = 3600000000;
pub const G_TIME_SPAN_MILLISECOND: i64 = 1000;
Expand Down
2 changes: 2 additions & 0 deletions glib/sys/tests/abi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,6 +1488,8 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
("(gint) G_TEST_LOG_STOP_CASE", "6"),
("(gint) G_TEST_LOG_STOP_SUITE", "11"),
("G_TEST_OPTION_ISOLATE_DIRS", "isolate_dirs"),
("G_TEST_OPTION_NONFATAL_ASSERTIONS", "nonfatal-assertions"),
("G_TEST_OPTION_NO_PRGNAME", "no_g_set_prgname"),
("(gint) G_TEST_RUN_FAILURE", "2"),
("(gint) G_TEST_RUN_INCOMPLETE", "3"),
("(gint) G_TEST_RUN_SKIPPED", "1"),
Expand Down
2 changes: 2 additions & 0 deletions glib/sys/tests/constant.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,8 @@ int main() {
PRINT_CONSTANT((gint) G_TEST_LOG_STOP_CASE);
PRINT_CONSTANT((gint) G_TEST_LOG_STOP_SUITE);
PRINT_CONSTANT(G_TEST_OPTION_ISOLATE_DIRS);
PRINT_CONSTANT(G_TEST_OPTION_NONFATAL_ASSERTIONS);
PRINT_CONSTANT(G_TEST_OPTION_NO_PRGNAME);
PRINT_CONSTANT((gint) G_TEST_RUN_FAILURE);
PRINT_CONSTANT((gint) G_TEST_RUN_INCOMPLETE);
PRINT_CONSTANT((gint) G_TEST_RUN_SKIPPED);
Expand Down
4 changes: 2 additions & 2 deletions glib/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 @ 25fc925cd3da)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
Generated by gir (https://github.com/gtk-rs/gir @ 1b34ebba86cb)
from gir-files (https://github.com/gtk-rs/gir-files @ dfdf5ed146d5)
4 changes: 2 additions & 2 deletions graphene/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 @ 25fc925cd3da)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
Generated by gir (https://github.com/gtk-rs/gir @ 1b34ebba86cb)
from gir-files (https://github.com/gtk-rs/gir-files @ dfdf5ed146d5)
4 changes: 2 additions & 2 deletions graphene/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 @ 25fc925cd3da)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
Generated by gir (https://github.com/gtk-rs/gir @ 1b34ebba86cb)
from gir-files (https://github.com/gtk-rs/gir-files @ dfdf5ed146d5)
1 change: 1 addition & 0 deletions pango/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ v1_48 = ["v1_46", "pango-sys/v1_48"]
v1_50 = ["v1_48", "pango-sys/v1_50"]
v1_52 = ["v1_50", "pango-sys/v1_52"]
v1_54 = ["v1_52", "pango-sys/v1_54"]
v1_56 = ["v1_54", "pango-sys/v1_56"]

[dependencies]
pango-sys.workspace = true
Expand Down
20 changes: 20 additions & 0 deletions pango/src/auto/font_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,26 @@ impl FontMap {
}

pub trait FontMapExt: IsA<FontMap> + 'static {
#[cfg(feature = "v1_56")]
#[cfg_attr(docsrs, doc(cfg(feature = "v1_56")))]
#[doc(alias = "pango_font_map_add_font_file")]
fn add_font_file(&self, filename: impl AsRef<std::path::Path>) -> Result<(), glib::Error> {
unsafe {
let mut error = std::ptr::null_mut();
let is_ok = ffi::pango_font_map_add_font_file(
self.as_ref().to_glib_none().0,
filename.as_ref().to_glib_none().0,
&mut error,
);
debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
if error.is_null() {
Ok(())
} else {
Err(from_glib_full(error))
}
}
}

#[doc(alias = "pango_font_map_changed")]
fn changed(&self) {
unsafe {
Expand Down
4 changes: 2 additions & 2 deletions pango/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 @ 25fc925cd3da)
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
Generated by gir (https://github.com/gtk-rs/gir @ 1b34ebba86cb)
from gir-files (https://github.com/gtk-rs/gir-files @ dfdf5ed146d5)
6 changes: 5 additions & 1 deletion pango/sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ v1_48 = ["v1_46"]
v1_50 = ["v1_48"]
v1_52 = ["v1_50"]
v1_54 = ["v1_52"]
v1_56 = ["v1_54"]

[lib]
name = "pango_sys"
Expand Down Expand Up @@ -79,7 +80,10 @@ version = "1.50"
version = "1.52"

[package.metadata.system-deps.pango.v1_54]
version = "1.53"
version = "1.54"

[package.metadata.system-deps.pango.v1_56]
version = "1.55"

[package.metadata.docs.rs]
rustc-args = ["--cfg", "docsrs"]
Expand Down
7 changes: 7 additions & 0 deletions pango/sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2399,6 +2399,13 @@ extern "C" {
// PangoFontMap
//=========================================================================
pub fn pango_font_map_get_type() -> GType;
#[cfg(feature = "v1_56")]
#[cfg_attr(docsrs, doc(cfg(feature = "v1_56")))]
pub fn pango_font_map_add_font_file(
fontmap: *mut PangoFontMap,
filename: *const c_char,
error: *mut *mut glib::GError,
) -> gboolean;
pub fn pango_font_map_changed(fontmap: *mut PangoFontMap);
pub fn pango_font_map_create_context(fontmap: *mut PangoFontMap) -> *mut PangoContext;
#[cfg(feature = "v1_46")]
Expand Down
Loading
Loading