diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8ecbc97f0c50..31ec8146c010 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -22,8 +22,8 @@ jobs: conf: - { name: "cairo", features: "png,pdf,svg,ps,use_glib,v1_18,freetype,script,xcb,xlib,win32-surface", nightly: "--features 'png,pdf,svg,ps,use_glib,v1_18,freetype,script,xcb,xlib,win32-surface'", test_sys: true } - { name: "gdk-pixbuf", features: "v2_42", nightly: "--all-features", test_sys: true } - - { name: "gio", features: "v2_80", nightly: "--all-features", test_sys: true } - - { name: "glib", features: "v2_80,log", nightly: "--all-features", test_sys: true } + - { 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: "pangocairo", features: "", nightly: "--all-features", test_sys: true } @@ -91,7 +91,7 @@ jobs: if: matrix.conf.test_sys && matrix.conf.name == 'glib' # GLib compile tests only on stable - name: Compile tests - run: cargo test --manifest-path glib/Cargo.toml --features "compiletests,v2_78" + run: cargo test --manifest-path glib/Cargo.toml --features "compiletests,v2_84" if: matrix.rust == 'stable' build-others: diff --git a/gdk-pixbuf/src/auto/versions.txt b/gdk-pixbuf/src/auto/versions.txt index 445f598fc16a..60ae865ee3d0 100644 --- a/gdk-pixbuf/src/auto/versions.txt +++ b/gdk-pixbuf/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) -from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) +Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545) +from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) diff --git a/gdk-pixbuf/sys/versions.txt b/gdk-pixbuf/sys/versions.txt index 445f598fc16a..60ae865ee3d0 100644 --- a/gdk-pixbuf/sys/versions.txt +++ b/gdk-pixbuf/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) -from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) +Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545) +from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) diff --git a/gio/Cargo.toml b/gio/Cargo.toml index 779c93329dad..99e8cfdc654a 100644 --- a/gio/Cargo.toml +++ b/gio/Cargo.toml @@ -31,6 +31,7 @@ v2_76 = ["v2_74", "gio-sys/v2_76", "glib/v2_76"] v2_78 = ["v2_76", "gio-sys/v2_78", "glib/v2_78"] v2_80 = ["v2_78", "gio-sys/v2_80", "glib/v2_80"] v2_82 = ["v2_80", "gio-sys/v2_82", "glib/v2_82"] +v2_84 = ["v2_82", "gio-sys/v2_84", "glib/v2_84"] [dependencies] libc.workspace = true diff --git a/gio/src/auto/app_launch_context.rs b/gio/src/auto/app_launch_context.rs index 9f27f554fa27..d2f8653c3cec 100644 --- a/gio/src/auto/app_launch_context.rs +++ b/gio/src/auto/app_launch_context.rs @@ -59,11 +59,15 @@ pub trait AppLaunchContextExt: IsA + 'static { #[doc(alias = "g_app_launch_context_get_startup_notify_id")] #[doc(alias = "get_startup_notify_id")] - fn startup_notify_id(&self, info: &impl IsA, files: &[File]) -> Option { + fn startup_notify_id( + &self, + info: Option<&impl IsA>, + files: &[File], + ) -> Option { unsafe { from_glib_full(ffi::g_app_launch_context_get_startup_notify_id( self.as_ref().to_glib_none().0, - info.as_ref().to_glib_none().0, + info.map(|p| p.as_ref()).to_glib_none().0, files.to_glib_none().0, )) } diff --git a/gio/src/auto/functions.rs b/gio/src/auto/functions.rs index 8afb479b5395..aeecbd2a3814 100644 --- a/gio/src/auto/functions.rs +++ b/gio/src/auto/functions.rs @@ -547,6 +547,13 @@ pub fn resources_get_info( } } +#[cfg(feature = "v2_84")] +#[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))] +#[doc(alias = "g_resources_has_children")] +pub fn resources_has_children(path: &str) -> bool { + unsafe { from_glib(ffi::g_resources_has_children(path.to_glib_none().0)) } +} + #[doc(alias = "g_resources_lookup_data")] pub fn resources_lookup_data( path: &str, diff --git a/gio/src/auto/resource.rs b/gio/src/auto/resource.rs index d57e10129f34..6e7c75d4fb8e 100644 --- a/gio/src/auto/resource.rs +++ b/gio/src/auto/resource.rs @@ -67,6 +67,18 @@ impl Resource { } } + #[cfg(feature = "v2_84")] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))] + #[doc(alias = "g_resource_has_children")] + pub fn has_children(&self, path: &str) -> bool { + unsafe { + from_glib(ffi::g_resource_has_children( + self.to_glib_none().0, + path.to_glib_none().0, + )) + } + } + #[doc(alias = "g_resource_lookup_data")] pub fn lookup_data( &self, diff --git a/gio/src/auto/versions.txt b/gio/src/auto/versions.txt index 445f598fc16a..60ae865ee3d0 100644 --- a/gio/src/auto/versions.txt +++ b/gio/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) -from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) +Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545) +from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) diff --git a/gio/sys/Cargo.toml b/gio/sys/Cargo.toml index 6ced01689953..93496a55970e 100644 --- a/gio/sys/Cargo.toml +++ b/gio/sys/Cargo.toml @@ -32,6 +32,7 @@ v2_76 = ["v2_74"] v2_78 = ["v2_76"] v2_80 = ["v2_78"] v2_82 = ["v2_80"] +v2_84 = ["v2_82"] [lib] name = "gio_sys" @@ -107,7 +108,10 @@ version = "2.77" version = "2.80" [package.metadata.system-deps.gio_2_0.v2_82] -version = "2.81" +version = "2.82" + +[package.metadata.system-deps.gio_2_0.v2_84] +version = "2.83" [package.metadata.docs.rs] rustc-args = ["--cfg", "docsrs"] diff --git a/gio/sys/src/lib.rs b/gio/sys/src/lib.rs index f9fbc1267698..eccdd13c934f 100644 --- a/gio/sys/src/lib.rs +++ b/gio/sys/src/lib.rs @@ -3404,6 +3404,7 @@ pub struct GFileIface { *mut *mut glib::GError, ) -> gboolean, >, + pub query_exists: Option gboolean>, } impl ::std::fmt::Debug for GFileIface { @@ -3555,6 +3556,7 @@ impl ::std::fmt::Debug for GFileIface { .field("measure_disk_usage", &self.measure_disk_usage) .field("measure_disk_usage_async", &self.measure_disk_usage_async) .field("measure_disk_usage_finish", &self.measure_disk_usage_finish) + .field("query_exists", &self.query_exists) .finish() } } @@ -10043,6 +10045,9 @@ extern "C" { flags: *mut u32, error: *mut *mut glib::GError, ) -> gboolean; + #[cfg(feature = "v2_84")] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))] + pub fn g_resource_has_children(resource: *mut GResource, path: *const c_char) -> gboolean; pub fn g_resource_lookup_data( resource: *mut GResource, path: *const c_char, @@ -17251,6 +17256,9 @@ extern "C" { flags: *mut u32, error: *mut *mut glib::GError, ) -> gboolean; + #[cfg(feature = "v2_84")] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))] + pub fn g_resources_has_children(path: *const c_char) -> gboolean; pub fn g_resources_lookup_data( path: *const c_char, lookup_flags: GResourceLookupFlags, @@ -17313,7 +17321,21 @@ extern "C" { pub fn g_unix_mount_is_system_internal(mount_entry: *mut GUnixMountEntry) -> gboolean; pub fn g_unix_mount_points_changed_since(time: u64) -> gboolean; pub fn g_unix_mount_points_get(time_read: *mut u64) -> *mut glib::GList; + #[cfg(feature = "v2_82")] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_82")))] + pub fn g_unix_mount_points_get_from_file( + table_path: *const c_char, + time_read_out: *mut u64, + n_points_out: *mut size_t, + ) -> *mut *mut GUnixMountPoint; pub fn g_unix_mounts_changed_since(time: u64) -> gboolean; pub fn g_unix_mounts_get(time_read: *mut u64) -> *mut glib::GList; + #[cfg(feature = "v2_82")] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_82")))] + pub fn g_unix_mounts_get_from_file( + table_path: *const c_char, + time_read_out: *mut u64, + n_entries_out: *mut size_t, + ) -> *mut *mut GUnixMountEntry; } diff --git a/gio/sys/versions.txt b/gio/sys/versions.txt index 445f598fc16a..60ae865ee3d0 100644 --- a/gio/sys/versions.txt +++ b/gio/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) -from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) +Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545) +from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) diff --git a/gir b/gir index eff839d4745d..af6703cf6545 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit eff839d4745d5eb210834507c2a9598741ad2e54 +Subproject commit af6703cf65453810c46003233c916896d36e8f24 diff --git a/gir-files b/gir-files index 4d1189172a70..e45712216c81 160000 --- a/gir-files +++ b/gir-files @@ -1 +1 @@ -Subproject commit 4d1189172a70c6cd6cd8db4954d7cfed2af3983b +Subproject commit e45712216c81cc5e03ac1e5a6846ef9bcf0ef642 diff --git a/glib/Cargo.toml b/glib/Cargo.toml index 9c7a58a25c73..56fe9337e6fe 100644 --- a/glib/Cargo.toml +++ b/glib/Cargo.toml @@ -53,6 +53,7 @@ v2_76 = ["v2_74", "glib-sys/v2_76", "gobject-sys/v2_76"] v2_78 = ["v2_76", "glib-sys/v2_78", "gobject-sys/v2_78"] v2_80 = ["v2_78", "glib-sys/v2_80", "gobject-sys/v2_80"] v2_82 = ["v2_80", "glib-sys/v2_82", "gobject-sys/v2_82"] +v2_84 = ["v2_82", "glib-sys/v2_84"] log = ["rs-log"] log_macros = ["log"] compiletests = [] diff --git a/glib/gobject-sys/Cargo.toml b/glib/gobject-sys/Cargo.toml index 575b7c66c374..844240624d24 100644 --- a/glib/gobject-sys/Cargo.toml +++ b/glib/gobject-sys/Cargo.toml @@ -92,7 +92,7 @@ version = "2.77" version = "2.80" [package.metadata.system-deps.gobject_2_0.v2_82] -version = "2.81" +version = "2.82" [package.metadata.docs.rs] rustc-args = ["--cfg", "docsrs"] diff --git a/glib/gobject-sys/versions.txt b/glib/gobject-sys/versions.txt index 445f598fc16a..60ae865ee3d0 100644 --- a/glib/gobject-sys/versions.txt +++ b/glib/gobject-sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) -from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) +Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545) +from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) diff --git a/glib/src/auto/functions.rs b/glib/src/auto/functions.rs index d311b313150d..b517156b49ed 100644 --- a/glib/src/auto/functions.rs +++ b/glib/src/auto/functions.rs @@ -695,6 +695,8 @@ pub fn shell_unquote( } } +//#[cfg(feature = "v2_82")] +//#[cfg_attr(docsrs, doc(cfg(feature = "v2_82")))] //#[doc(alias = "g_sort_array")] //pub fn sort_array(array: /*Unimplemented*/&[&Basic: Pointer], element_size: usize, compare_func: /*Unimplemented*/FnMut(/*Unimplemented*/Option, /*Unimplemented*/Option) -> i32, user_data: /*Unimplemented*/Option) { // unsafe { TODO: call ffi:g_sort_array() } diff --git a/glib/src/auto/main_context.rs b/glib/src/auto/main_context.rs index aa23424e48a8..eaa868c9ca5a 100644 --- a/glib/src/auto/main_context.rs +++ b/glib/src/auto/main_context.rs @@ -85,6 +85,13 @@ impl MainContext { unsafe { from_glib(ffi::g_main_context_pending(self.to_glib_none().0)) } } + //#[cfg(feature = "v2_64")] + //#[cfg_attr(docsrs, doc(cfg(feature = "v2_64")))] + //#[doc(alias = "g_main_context_pusher_new")] + //pub fn pusher_new(&self) -> /*Unknown conversion*//*Unimplemented*/MainContextPusher { + // unsafe { TODO: call ffi:g_main_context_pusher_new() } + //} + //#[doc(alias = "g_main_context_query")] //pub fn query(&self, max_priority: i32, fds: /*Ignored*/Vec) -> (i32, i32) { // unsafe { TODO: call ffi:g_main_context_query() } @@ -126,6 +133,13 @@ impl MainContext { unsafe { from_glib_none(ffi::g_main_context_get_thread_default()) } } + //#[cfg(feature = "v2_64")] + //#[cfg_attr(docsrs, doc(cfg(feature = "v2_64")))] + //#[doc(alias = "g_main_context_pusher_free")] + //pub fn pusher_free(pusher: /*Unknown conversion*//*Unimplemented*/MainContextPusher) { + // unsafe { TODO: call ffi:g_main_context_pusher_free() } + //} + #[doc(alias = "g_main_context_ref_thread_default")] pub fn ref_thread_default() -> MainContext { unsafe { from_glib_full(ffi::g_main_context_ref_thread_default()) } diff --git a/glib/src/auto/versions.txt b/glib/src/auto/versions.txt index 445f598fc16a..60ae865ee3d0 100644 --- a/glib/src/auto/versions.txt +++ b/glib/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) -from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) +Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545) +from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) diff --git a/glib/sys/Cargo.toml b/glib/sys/Cargo.toml index f61c9f2c4781..15806cf5117b 100644 --- a/glib/sys/Cargo.toml +++ b/glib/sys/Cargo.toml @@ -22,6 +22,7 @@ v2_76 = ["v2_74"] v2_78 = ["v2_76"] v2_80 = ["v2_78"] v2_82 = ["v2_80"] +v2_84 = ["v2_82"] [lib] name = "glib_sys" @@ -97,7 +98,10 @@ version = "2.77" version = "2.80" [package.metadata.system-deps.glib_2_0.v2_82] -version = "2.81" +version = "2.82" + +[package.metadata.system-deps.glib_2_0.v2_84] +version = "2.83" [package.metadata.system-deps.gobject_2_0] name = "gobject-2.0" diff --git a/glib/sys/src/lib.rs b/glib/sys/src/lib.rs index ab5f3f5d83cf..ad36c51382ff 100644 --- a/glib/sys/src/lib.rs +++ b/glib/sys/src/lib.rs @@ -4150,6 +4150,9 @@ extern "C" { pub fn g_main_context_pop_thread_default(context: *mut GMainContext); pub fn g_main_context_prepare(context: *mut GMainContext, priority: *mut c_int) -> gboolean; pub fn g_main_context_push_thread_default(context: *mut GMainContext); + #[cfg(feature = "v2_64")] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_64")))] + pub fn g_main_context_pusher_new(main_context: *mut GMainContext) -> *mut GMainContextPusher; pub fn g_main_context_query( context: *mut GMainContext, max_priority: c_int, @@ -4170,6 +4173,9 @@ extern "C" { pub fn g_main_context_wakeup(context: *mut GMainContext); pub fn g_main_context_default() -> *mut GMainContext; pub fn g_main_context_get_thread_default() -> *mut GMainContext; + #[cfg(feature = "v2_64")] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_64")))] + pub fn g_main_context_pusher_free(pusher: *mut GMainContextPusher); pub fn g_main_context_ref_thread_default() -> *mut GMainContext; //========================================================================= @@ -6000,6 +6006,9 @@ extern "C" { pub fn g_variant_builder_close(builder: *mut GVariantBuilder); pub fn g_variant_builder_end(builder: *mut GVariantBuilder) -> *mut GVariant; pub fn g_variant_builder_init(builder: *mut GVariantBuilder, type_: *const GVariantType); + #[cfg(feature = "v2_84")] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))] + pub fn g_variant_builder_init_static(builder: *mut GVariantBuilder, type_: *const GVariantType); pub fn g_variant_builder_open(builder: *mut GVariantBuilder, type_: *const GVariantType); pub fn g_variant_builder_ref(builder: *mut GVariantBuilder) -> *mut GVariantBuilder; pub fn g_variant_builder_unref(builder: *mut GVariantBuilder); @@ -6946,6 +6955,9 @@ extern "C" { #[cfg(feature = "v2_58")] #[cfg_attr(docsrs, doc(cfg(feature = "v2_58")))] pub fn g_ref_string_acquire(str: *mut c_char) -> *mut c_char; + #[cfg(feature = "v2_84")] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))] + pub fn g_ref_string_equal(str1: *const c_char, str2: *const c_char) -> gboolean; #[cfg(feature = "v2_58")] #[cfg_attr(docsrs, doc(cfg(feature = "v2_58")))] pub fn g_ref_string_length(str: *mut c_char) -> size_t; diff --git a/glib/sys/versions.txt b/glib/sys/versions.txt index 445f598fc16a..60ae865ee3d0 100644 --- a/glib/sys/versions.txt +++ b/glib/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) -from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) +Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545) +from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) diff --git a/graphene/src/auto/versions.txt b/graphene/src/auto/versions.txt index 445f598fc16a..60ae865ee3d0 100644 --- a/graphene/src/auto/versions.txt +++ b/graphene/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) -from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) +Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545) +from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) diff --git a/graphene/sys/versions.txt b/graphene/sys/versions.txt index 445f598fc16a..60ae865ee3d0 100644 --- a/graphene/sys/versions.txt +++ b/graphene/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) -from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) +Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545) +from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) diff --git a/pango/src/auto/versions.txt b/pango/src/auto/versions.txt index 445f598fc16a..60ae865ee3d0 100644 --- a/pango/src/auto/versions.txt +++ b/pango/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) -from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) +Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545) +from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) diff --git a/pango/sys/versions.txt b/pango/sys/versions.txt index 445f598fc16a..60ae865ee3d0 100644 --- a/pango/sys/versions.txt +++ b/pango/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) -from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) +Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545) +from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) diff --git a/pangocairo/src/auto/versions.txt b/pangocairo/src/auto/versions.txt index 445f598fc16a..60ae865ee3d0 100644 --- a/pangocairo/src/auto/versions.txt +++ b/pangocairo/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) -from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) +Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545) +from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) diff --git a/pangocairo/sys/versions.txt b/pangocairo/sys/versions.txt index 445f598fc16a..60ae865ee3d0 100644 --- a/pangocairo/sys/versions.txt +++ b/pangocairo/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) -from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) +Generated by gir (https://github.com/gtk-rs/gir @ af6703cf6545) +from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81)