diff --git a/gdk-pixbuf/src/auto/pixbuf_loader.rs b/gdk-pixbuf/src/auto/pixbuf_loader.rs index 581b57c18a81..75791badf965 100644 --- a/gdk-pixbuf/src/auto/pixbuf_loader.rs +++ b/gdk-pixbuf/src/auto/pixbuf_loader.rs @@ -4,6 +4,7 @@ use crate::{ffi, Pixbuf, PixbufAnimation, PixbufFormat}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gdk-pixbuf/src/auto/versions.txt b/gdk-pixbuf/src/auto/versions.txt index 1a56b9ecf195..ebdad18d0acb 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 @ be3ecc201d39) -from gir-files (https://github.com/gtk-rs/gir-files @ 3ede86d6a218) +Generated by gir (https://github.com/gtk-rs/gir @ 3491754499c3) +from gir-files (https://github.com/gtk-rs/gir-files @ ced5802891b1) diff --git a/gdk-pixbuf/src/lib.rs b/gdk-pixbuf/src/lib.rs index 1d662e697f2c..abe7836b0a69 100644 --- a/gdk-pixbuf/src/lib.rs +++ b/gdk-pixbuf/src/lib.rs @@ -9,6 +9,7 @@ pub use gio; pub use glib; #[allow(clippy::too_many_arguments)] +#[allow(unused_imports)] mod auto; pub mod subclass; diff --git a/gdk-pixbuf/sys/versions.txt b/gdk-pixbuf/sys/versions.txt index 1a56b9ecf195..ebdad18d0acb 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 @ be3ecc201d39) -from gir-files (https://github.com/gtk-rs/gir-files @ 3ede86d6a218) +Generated by gir (https://github.com/gtk-rs/gir @ 3491754499c3) +from gir-files (https://github.com/gtk-rs/gir-files @ ced5802891b1) diff --git a/gio/src/auto/action_group.rs b/gio/src/auto/action_group.rs index de2602772c82..e041de963c5a 100644 --- a/gio/src/auto/action_group.rs +++ b/gio/src/auto/action_group.rs @@ -4,6 +4,7 @@ use crate::ffi; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/app_info_monitor.rs b/gio/src/auto/app_info_monitor.rs index e1a6e3d32c3d..b4d09d5acb3f 100644 --- a/gio/src/auto/app_info_monitor.rs +++ b/gio/src/auto/app_info_monitor.rs @@ -4,6 +4,7 @@ use crate::ffi; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/app_launch_context.rs b/gio/src/auto/app_launch_context.rs index 106738cd4593..ab4bdb913ad9 100644 --- a/gio/src/auto/app_launch_context.rs +++ b/gio/src/auto/app_launch_context.rs @@ -4,6 +4,7 @@ use crate::{ffi, AppInfo, File}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/application.rs b/gio/src/auto/application.rs index f98d10328cbc..009a68e0eaa4 100644 --- a/gio/src/auto/application.rs +++ b/gio/src/auto/application.rs @@ -7,6 +7,7 @@ use crate::{ DBusConnection, File, Notification, }; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/dbus_auth_observer.rs b/gio/src/auto/dbus_auth_observer.rs index d27dede1b213..984ef8ea310a 100644 --- a/gio/src/auto/dbus_auth_observer.rs +++ b/gio/src/auto/dbus_auth_observer.rs @@ -4,6 +4,7 @@ use crate::{ffi, Credentials, IOStream}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/dbus_connection.rs b/gio/src/auto/dbus_connection.rs index 3a7f7caf3784..47f5e4bb46cf 100644 --- a/gio/src/auto/dbus_connection.rs +++ b/gio/src/auto/dbus_connection.rs @@ -11,6 +11,7 @@ use crate::{ Initable, }; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/dbus_interface_skeleton.rs b/gio/src/auto/dbus_interface_skeleton.rs index d370d7291676..663a5c59b72f 100644 --- a/gio/src/auto/dbus_interface_skeleton.rs +++ b/gio/src/auto/dbus_interface_skeleton.rs @@ -7,6 +7,7 @@ use crate::{ DBusMethodInvocation, }; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/dbus_object.rs b/gio/src/auto/dbus_object.rs index fce91c3f96a1..b510bc65ee80 100644 --- a/gio/src/auto/dbus_object.rs +++ b/gio/src/auto/dbus_object.rs @@ -4,6 +4,7 @@ use crate::{ffi, DBusInterface}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/dbus_object_manager.rs b/gio/src/auto/dbus_object_manager.rs index 267d5adaec80..8a90caecd8f8 100644 --- a/gio/src/auto/dbus_object_manager.rs +++ b/gio/src/auto/dbus_object_manager.rs @@ -4,6 +4,7 @@ use crate::{ffi, DBusInterface, DBusObject}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/dbus_object_skeleton.rs b/gio/src/auto/dbus_object_skeleton.rs index 8bbe63aa212c..c85e0f453d14 100644 --- a/gio/src/auto/dbus_object_skeleton.rs +++ b/gio/src/auto/dbus_object_skeleton.rs @@ -4,6 +4,7 @@ use crate::{ffi, DBusInterfaceSkeleton, DBusMethodInvocation, DBusObject}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/dbus_server.rs b/gio/src/auto/dbus_server.rs index a8bfe9d31572..f3d238237417 100644 --- a/gio/src/auto/dbus_server.rs +++ b/gio/src/auto/dbus_server.rs @@ -4,6 +4,7 @@ use crate::{ffi, Cancellable, DBusAuthObserver, DBusConnection, DBusServerFlags, Initable}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/debug_controller_dbus.rs b/gio/src/auto/debug_controller_dbus.rs index f2041a712e6d..13a692b6ac65 100644 --- a/gio/src/auto/debug_controller_dbus.rs +++ b/gio/src/auto/debug_controller_dbus.rs @@ -4,6 +4,7 @@ use crate::{ffi, Cancellable, DBusConnection, DBusMethodInvocation, DebugController, Initable}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/drive.rs b/gio/src/auto/drive.rs index 5f98949d67d1..a90cdd3eba27 100644 --- a/gio/src/auto/drive.rs +++ b/gio/src/auto/drive.rs @@ -7,6 +7,7 @@ use crate::{ MountUnmountFlags, Volume, }; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/dtls_connection.rs b/gio/src/auto/dtls_connection.rs index 857c1ef04f0c..56f72ea5e544 100644 --- a/gio/src/auto/dtls_connection.rs +++ b/gio/src/auto/dtls_connection.rs @@ -11,6 +11,7 @@ use crate::{ TlsInteraction, TlsRehandshakeMode, }; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/file_monitor.rs b/gio/src/auto/file_monitor.rs index 93f5d45dcf84..b12356fbb456 100644 --- a/gio/src/auto/file_monitor.rs +++ b/gio/src/auto/file_monitor.rs @@ -4,6 +4,7 @@ use crate::{ffi, File, FileMonitorEvent}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/filename_completer.rs b/gio/src/auto/filename_completer.rs index 9628f0dc4ce0..c59480173453 100644 --- a/gio/src/auto/filename_completer.rs +++ b/gio/src/auto/filename_completer.rs @@ -4,6 +4,7 @@ use crate::ffi; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/flags.rs b/gio/src/auto/flags.rs index a94668ca20e8..30046ab36d83 100644 --- a/gio/src/auto/flags.rs +++ b/gio/src/auto/flags.rs @@ -96,6 +96,7 @@ bitflags! { #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] #[doc(alias = "GApplicationFlags")] pub struct ApplicationFlags: u32 { + #[cfg_attr(feature = "v2_74", deprecated = "Since 2.74")] #[doc(alias = "G_APPLICATION_FLAGS_NONE")] const FLAGS_NONE = ffi::G_APPLICATION_FLAGS_NONE as _; #[doc(alias = "G_APPLICATION_IS_SERVICE")] diff --git a/gio/src/auto/list_model.rs b/gio/src/auto/list_model.rs index ebf561ff74ad..1edf56219141 100644 --- a/gio/src/auto/list_model.rs +++ b/gio/src/auto/list_model.rs @@ -4,6 +4,7 @@ use crate::ffi; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/memory_monitor.rs b/gio/src/auto/memory_monitor.rs index 13b797c736e3..8e63b0d6e8c1 100644 --- a/gio/src/auto/memory_monitor.rs +++ b/gio/src/auto/memory_monitor.rs @@ -4,6 +4,7 @@ use crate::{ffi, Initable, MemoryMonitorWarningLevel}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/menu_model.rs b/gio/src/auto/menu_model.rs index f3685eda8639..f60aa284397c 100644 --- a/gio/src/auto/menu_model.rs +++ b/gio/src/auto/menu_model.rs @@ -4,6 +4,7 @@ use crate::{ffi, MenuAttributeIter, MenuLinkIter}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/mount.rs b/gio/src/auto/mount.rs index fd3dde58a985..ec094550bce6 100644 --- a/gio/src/auto/mount.rs +++ b/gio/src/auto/mount.rs @@ -7,6 +7,7 @@ use crate::{ MountUnmountFlags, Volume, }; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/mount_operation.rs b/gio/src/auto/mount_operation.rs index c6f614cab4bf..8505568edb40 100644 --- a/gio/src/auto/mount_operation.rs +++ b/gio/src/auto/mount_operation.rs @@ -4,6 +4,7 @@ use crate::{ffi, AskPasswordFlags, MountOperationResult, PasswordSave}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/network_monitor.rs b/gio/src/auto/network_monitor.rs index 12b49d3f99c1..099155785d99 100644 --- a/gio/src/auto/network_monitor.rs +++ b/gio/src/auto/network_monitor.rs @@ -4,6 +4,7 @@ use crate::{ffi, AsyncResult, Cancellable, Initable, NetworkConnectivity, SocketConnectable}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/resolver.rs b/gio/src/auto/resolver.rs index a32304c2db2e..f29a56f7889e 100644 --- a/gio/src/auto/resolver.rs +++ b/gio/src/auto/resolver.rs @@ -7,6 +7,7 @@ use crate::ResolverNameLookupFlags; use crate::{ffi, AsyncResult, Cancellable, InetAddress, ResolverRecordType, SrvTarget}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/settings.rs b/gio/src/auto/settings.rs index 65bf0e73ce06..e5614eea88f8 100644 --- a/gio/src/auto/settings.rs +++ b/gio/src/auto/settings.rs @@ -7,6 +7,7 @@ use crate::SettingsBindFlags; use crate::{ffi, Action, SettingsBackend, SettingsSchema}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/simple_action.rs b/gio/src/auto/simple_action.rs index b054bc97afc2..301efee80016 100644 --- a/gio/src/auto/simple_action.rs +++ b/gio/src/auto/simple_action.rs @@ -4,6 +4,7 @@ use crate::{ffi, Action}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/socket_client.rs b/gio/src/auto/socket_client.rs index 823a278a629c..a16965b5d93d 100644 --- a/gio/src/auto/socket_client.rs +++ b/gio/src/auto/socket_client.rs @@ -9,6 +9,7 @@ use crate::{ TlsCertificateFlags, }; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/socket_listener.rs b/gio/src/auto/socket_listener.rs index 065d50b7aa43..7d06873fbdc6 100644 --- a/gio/src/auto/socket_listener.rs +++ b/gio/src/auto/socket_listener.rs @@ -7,6 +7,7 @@ use crate::{ SocketProtocol, SocketType, }; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/socket_service.rs b/gio/src/auto/socket_service.rs index bc5ea3167586..aa251fc77207 100644 --- a/gio/src/auto/socket_service.rs +++ b/gio/src/auto/socket_service.rs @@ -4,6 +4,7 @@ use crate::{ffi, SocketConnection, SocketListener}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/threaded_socket_service.rs b/gio/src/auto/threaded_socket_service.rs index 152f11bfc6fb..fc86f3610f78 100644 --- a/gio/src/auto/threaded_socket_service.rs +++ b/gio/src/auto/threaded_socket_service.rs @@ -4,6 +4,7 @@ use crate::{ffi, SocketConnection, SocketListener, SocketService}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/tls_connection.rs b/gio/src/auto/tls_connection.rs index 3facee8c9880..9de39c215b0e 100644 --- a/gio/src/auto/tls_connection.rs +++ b/gio/src/auto/tls_connection.rs @@ -11,6 +11,7 @@ use crate::{ TlsInteraction, TlsRehandshakeMode, }; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/unix_mount_monitor.rs b/gio/src/auto/unix_mount_monitor.rs index 87cb6b7bf9e2..c08492b6ff90 100644 --- a/gio/src/auto/unix_mount_monitor.rs +++ b/gio/src/auto/unix_mount_monitor.rs @@ -4,6 +4,7 @@ use crate::ffi; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/versions.txt b/gio/src/auto/versions.txt index 1a56b9ecf195..ebdad18d0acb 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 @ be3ecc201d39) -from gir-files (https://github.com/gtk-rs/gir-files @ 3ede86d6a218) +Generated by gir (https://github.com/gtk-rs/gir @ 3491754499c3) +from gir-files (https://github.com/gtk-rs/gir-files @ ced5802891b1) diff --git a/gio/src/auto/volume.rs b/gio/src/auto/volume.rs index ed6ba8f0c1fa..5bcc88774256 100644 --- a/gio/src/auto/volume.rs +++ b/gio/src/auto/volume.rs @@ -7,6 +7,7 @@ use crate::{ MountUnmountFlags, }; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/src/auto/volume_monitor.rs b/gio/src/auto/volume_monitor.rs index 0f0f991c2ac3..fb6ed64e717e 100644 --- a/gio/src/auto/volume_monitor.rs +++ b/gio/src/auto/volume_monitor.rs @@ -4,6 +4,7 @@ use crate::{ffi, Drive, Mount, Volume}; use glib::{ + object::ObjectType as _, prelude::*, signal::{connect_raw, SignalHandlerId}, translate::*, diff --git a/gio/sys/src/lib.rs b/gio/sys/src/lib.rs index de6edc66465f..6fea7c31b83d 100644 --- a/gio/sys/src/lib.rs +++ b/gio/sys/src/lib.rs @@ -535,6 +535,8 @@ pub const G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION: GAppInfoCreateFlags = pub type GApplicationFlags = c_uint; pub const G_APPLICATION_FLAGS_NONE: GApplicationFlags = 0; +#[cfg(feature = "v2_74")] +#[cfg_attr(docsrs, doc(cfg(feature = "v2_74")))] pub const G_APPLICATION_DEFAULT_FLAGS: GApplicationFlags = 0; pub const G_APPLICATION_IS_SERVICE: GApplicationFlags = 1; pub const G_APPLICATION_IS_LAUNCHER: GApplicationFlags = 2; diff --git a/gio/sys/versions.txt b/gio/sys/versions.txt index 1a56b9ecf195..ebdad18d0acb 100644 --- a/gio/sys/versions.txt +++ b/gio/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ be3ecc201d39) -from gir-files (https://github.com/gtk-rs/gir-files @ 3ede86d6a218) +Generated by gir (https://github.com/gtk-rs/gir @ 3491754499c3) +from gir-files (https://github.com/gtk-rs/gir-files @ ced5802891b1) diff --git a/gir b/gir index be3ecc201d39..3491754499c3 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit be3ecc201d39c77befa1eb3abad2a3eed3c83eb0 +Subproject commit 3491754499c35f6be46f3e54e56d9fd5675e771b diff --git a/gir-files b/gir-files index 3ede86d6a218..ced5802891b1 160000 --- a/gir-files +++ b/gir-files @@ -1 +1 @@ -Subproject commit 3ede86d6a21889d58809d8bdaab33e995fda8c15 +Subproject commit ced5802891b106563d09abca0c834a82601c9222 diff --git a/glib/Cargo.toml b/glib/Cargo.toml index 56fe9337e6fe..69a7cb208f5b 100644 --- a/glib/Cargo.toml +++ b/glib/Cargo.toml @@ -53,7 +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"] +v2_84 = ["v2_82", "glib-sys/v2_84", "gobject-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 844240624d24..ee4da0925527 100644 --- a/glib/gobject-sys/Cargo.toml +++ b/glib/gobject-sys/Cargo.toml @@ -23,6 +23,7 @@ v2_76 = ["v2_74"] v2_78 = ["v2_74"] v2_80 = ["v2_78"] v2_82 = ["v2_80"] +v2_84 = ["v2_80"] [lib] name = "gobject_sys" @@ -94,6 +95,9 @@ version = "2.80" [package.metadata.system-deps.gobject_2_0.v2_82] version = "2.82" +[package.metadata.system-deps.gobject_2_0.v2_84] +version = "2.83" + [package.metadata.docs.rs] rustc-args = ["--cfg", "docsrs"] rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"] diff --git a/glib/gobject-sys/src/lib.rs b/glib/gobject-sys/src/lib.rs index 56ee48133713..1eb4af702b4d 100644 --- a/glib/gobject-sys/src/lib.rs +++ b/glib/gobject-sys/src/lib.rs @@ -1774,6 +1774,9 @@ extern "C" { g_class: gpointer, private_size_or_offset: *mut c_int, ); + #[cfg(feature = "v2_84")] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))] + pub fn g_type_class_get(type_: GType) -> gpointer; pub fn g_type_class_peek(type_: GType) -> gpointer; pub fn g_type_class_peek_static(type_: GType) -> gpointer; pub fn g_type_class_ref(type_: GType) -> gpointer; @@ -1929,10 +1932,10 @@ extern "C" { //========================================================================= // GWeakRef //========================================================================= - pub fn g_weak_ref_set(weak_ref: *mut GWeakRef, object: *mut GObject); pub fn g_weak_ref_clear(weak_ref: *mut GWeakRef); pub fn g_weak_ref_get(weak_ref: *mut GWeakRef) -> *mut GObject; pub fn g_weak_ref_init(weak_ref: *mut GWeakRef, object: *mut GObject); + pub fn g_weak_ref_set(weak_ref: *mut GWeakRef, object: *mut GObject); //========================================================================= // GBinding @@ -2779,6 +2782,9 @@ extern "C" { pub fn g_type_check_value_holds(value: *const GValue, type_: GType) -> gboolean; pub fn g_type_children(type_: GType, n_children: *mut c_uint) -> *mut GType; pub fn g_type_create_instance(type_: GType) -> *mut GTypeInstance; + #[cfg(feature = "v2_84")] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))] + pub fn g_type_default_interface_get(g_type: GType) -> gpointer; pub fn g_type_default_interface_peek(g_type: GType) -> gpointer; pub fn g_type_default_interface_ref(g_type: GType) -> gpointer; pub fn g_type_default_interface_unref(g_iface: gpointer); diff --git a/glib/gobject-sys/versions.txt b/glib/gobject-sys/versions.txt index 1a56b9ecf195..ebdad18d0acb 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 @ be3ecc201d39) -from gir-files (https://github.com/gtk-rs/gir-files @ 3ede86d6a218) +Generated by gir (https://github.com/gtk-rs/gir @ 3491754499c3) +from gir-files (https://github.com/gtk-rs/gir-files @ ced5802891b1) diff --git a/glib/src/auto/flags.rs b/glib/src/auto/flags.rs index 43f17380b302..2f1774dec589 100644 --- a/glib/src/auto/flags.rs +++ b/glib/src/auto/flags.rs @@ -341,6 +341,10 @@ bitflags! { const OPTIONAL_ARG = ffi::G_OPTION_FLAG_OPTIONAL_ARG as _; #[doc(alias = "G_OPTION_FLAG_NOALIAS")] const NOALIAS = ffi::G_OPTION_FLAG_NOALIAS as _; + #[cfg(feature = "v2_84")] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))] + #[doc(alias = "G_OPTION_FLAG_DEPRECATED")] + const DEPRECATED = ffi::G_OPTION_FLAG_DEPRECATED as _; } } diff --git a/glib/src/auto/versions.txt b/glib/src/auto/versions.txt index 1a56b9ecf195..ebdad18d0acb 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 @ be3ecc201d39) -from gir-files (https://github.com/gtk-rs/gir-files @ 3ede86d6a218) +Generated by gir (https://github.com/gtk-rs/gir @ 3491754499c3) +from gir-files (https://github.com/gtk-rs/gir-files @ ced5802891b1) diff --git a/glib/sys/src/lib.rs b/glib/sys/src/lib.rs index 8fd7ad5c4460..de45848440f8 100644 --- a/glib/sys/src/lib.rs +++ b/glib/sys/src/lib.rs @@ -911,6 +911,9 @@ pub const G_OPTION_FLAG_NO_ARG: GOptionFlags = 8; pub const G_OPTION_FLAG_FILENAME: GOptionFlags = 16; pub const G_OPTION_FLAG_OPTIONAL_ARG: GOptionFlags = 32; pub const G_OPTION_FLAG_NOALIAS: GOptionFlags = 64; +#[cfg(feature = "v2_84")] +#[cfg_attr(docsrs, doc(cfg(feature = "v2_84")))] +pub const G_OPTION_FLAG_DEPRECATED: GOptionFlags = 128; pub type GRegexCompileFlags = c_uint; pub const G_REGEX_DEFAULT: GRegexCompileFlags = 0; diff --git a/glib/sys/tests/abi.rs b/glib/sys/tests/abi.rs index b4a3a972ec5f..a108ec40fe20 100644 --- a/glib/sys/tests/abi.rs +++ b/glib/sys/tests/abi.rs @@ -1283,6 +1283,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("(gint) G_OPTION_ERROR_BAD_VALUE", "1"), ("(gint) G_OPTION_ERROR_FAILED", "2"), ("(gint) G_OPTION_ERROR_UNKNOWN_OPTION", "0"), + ("(guint) G_OPTION_FLAG_DEPRECATED", "128"), ("(guint) G_OPTION_FLAG_FILENAME", "16"), ("(guint) G_OPTION_FLAG_HIDDEN", "1"), ("(guint) G_OPTION_FLAG_IN_MAIN", "2"), diff --git a/glib/sys/tests/constant.c b/glib/sys/tests/constant.c index 8dad5595f053..b51a93536637 100644 --- a/glib/sys/tests/constant.c +++ b/glib/sys/tests/constant.c @@ -291,6 +291,7 @@ int main() { PRINT_CONSTANT((gint) G_OPTION_ERROR_BAD_VALUE); PRINT_CONSTANT((gint) G_OPTION_ERROR_FAILED); PRINT_CONSTANT((gint) G_OPTION_ERROR_UNKNOWN_OPTION); + PRINT_CONSTANT((guint) G_OPTION_FLAG_DEPRECATED); PRINT_CONSTANT((guint) G_OPTION_FLAG_FILENAME); PRINT_CONSTANT((guint) G_OPTION_FLAG_HIDDEN); PRINT_CONSTANT((guint) G_OPTION_FLAG_IN_MAIN); diff --git a/glib/sys/versions.txt b/glib/sys/versions.txt index 1a56b9ecf195..ebdad18d0acb 100644 --- a/glib/sys/versions.txt +++ b/glib/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ be3ecc201d39) -from gir-files (https://github.com/gtk-rs/gir-files @ 3ede86d6a218) +Generated by gir (https://github.com/gtk-rs/gir @ 3491754499c3) +from gir-files (https://github.com/gtk-rs/gir-files @ ced5802891b1) diff --git a/graphene/src/auto/versions.txt b/graphene/src/auto/versions.txt index 1a56b9ecf195..ebdad18d0acb 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 @ be3ecc201d39) -from gir-files (https://github.com/gtk-rs/gir-files @ 3ede86d6a218) +Generated by gir (https://github.com/gtk-rs/gir @ 3491754499c3) +from gir-files (https://github.com/gtk-rs/gir-files @ ced5802891b1) diff --git a/graphene/sys/versions.txt b/graphene/sys/versions.txt index 1a56b9ecf195..ebdad18d0acb 100644 --- a/graphene/sys/versions.txt +++ b/graphene/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ be3ecc201d39) -from gir-files (https://github.com/gtk-rs/gir-files @ 3ede86d6a218) +Generated by gir (https://github.com/gtk-rs/gir @ 3491754499c3) +from gir-files (https://github.com/gtk-rs/gir-files @ ced5802891b1) diff --git a/pango/Gir.toml b/pango/Gir.toml index f337f31393a0..33f2ec581793 100644 --- a/pango/Gir.toml +++ b/pango/Gir.toml @@ -270,6 +270,12 @@ concurrency = "send+sync" [[object.function]] name = "merge_static" ignore = true + [[object.function]] + name = "set_features_static" + ignore = true + [[object.function]] + name = "set_variations_static" + ignore = true [[object]] name = "Pango.FontFamily" diff --git a/pango/src/auto/enums.rs b/pango/src/auto/enums.rs index a2c294ba9066..5e6bf819ceaa 100644 --- a/pango/src/auto/enums.rs +++ b/pango/src/auto/enums.rs @@ -2968,6 +2968,10 @@ pub enum WrapMode { Char, #[doc(alias = "PANGO_WRAP_WORD_CHAR")] WordChar, + #[cfg(feature = "v1_56")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_56")))] + #[doc(alias = "PANGO_WRAP_NONE")] + None, #[doc(hidden)] __Unknown(i32), } @@ -2982,6 +2986,8 @@ impl IntoGlib for WrapMode { Self::Word => ffi::PANGO_WRAP_WORD, Self::Char => ffi::PANGO_WRAP_CHAR, Self::WordChar => ffi::PANGO_WRAP_WORD_CHAR, + #[cfg(feature = "v1_56")] + Self::None => ffi::PANGO_WRAP_NONE, Self::__Unknown(value) => value, } } @@ -2995,6 +3001,8 @@ impl FromGlib for WrapMode { ffi::PANGO_WRAP_WORD => Self::Word, ffi::PANGO_WRAP_CHAR => Self::Char, ffi::PANGO_WRAP_WORD_CHAR => Self::WordChar, + #[cfg(feature = "v1_56")] + ffi::PANGO_WRAP_NONE => Self::None, value => Self::__Unknown(value), } } diff --git a/pango/src/auto/flags.rs b/pango/src/auto/flags.rs index 9727a7bc8f00..67d7835c2573 100644 --- a/pango/src/auto/flags.rs +++ b/pango/src/auto/flags.rs @@ -23,8 +23,14 @@ bitflags! { const SIZE = ffi::PANGO_FONT_MASK_SIZE as _; #[doc(alias = "PANGO_FONT_MASK_GRAVITY")] const GRAVITY = ffi::PANGO_FONT_MASK_GRAVITY as _; + #[cfg(feature = "v1_42")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_42")))] #[doc(alias = "PANGO_FONT_MASK_VARIATIONS")] const VARIATIONS = ffi::PANGO_FONT_MASK_VARIATIONS as _; + #[cfg(feature = "v1_56")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_56")))] + #[doc(alias = "PANGO_FONT_MASK_FEATURES")] + const FEATURES = ffi::PANGO_FONT_MASK_FEATURES as _; } } diff --git a/pango/src/auto/font_description.rs b/pango/src/auto/font_description.rs index 78df0169ee00..a5147d7bbc9a 100644 --- a/pango/src/auto/font_description.rs +++ b/pango/src/auto/font_description.rs @@ -57,6 +57,18 @@ impl FontDescription { } } + #[cfg(feature = "v1_56")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_56")))] + #[doc(alias = "pango_font_description_get_features")] + #[doc(alias = "get_features")] + pub fn features(&self) -> Option { + unsafe { + from_glib_none(ffi::pango_font_description_get_features( + self.to_glib_none().0, + )) + } + } + #[doc(alias = "pango_font_description_get_gravity")] #[doc(alias = "get_gravity")] pub fn gravity(&self) -> Gravity { @@ -174,6 +186,18 @@ impl FontDescription { } } + #[cfg(feature = "v1_56")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_56")))] + #[doc(alias = "pango_font_description_set_features")] + pub fn set_features(&mut self, features: Option<&str>) { + unsafe { + ffi::pango_font_description_set_features( + self.to_glib_none_mut().0, + features.to_glib_none().0, + ); + } + } + #[doc(alias = "pango_font_description_set_gravity")] pub fn set_gravity(&mut self, gravity: Gravity) { unsafe { @@ -221,18 +245,6 @@ impl FontDescription { } } - #[cfg(feature = "v1_42")] - #[cfg_attr(docsrs, doc(cfg(feature = "v1_42")))] - #[doc(alias = "pango_font_description_set_variations_static")] - pub fn set_variations_static(&mut self, variations: &str) { - unsafe { - ffi::pango_font_description_set_variations_static( - self.to_glib_none_mut().0, - variations.to_glib_none().0, - ); - } - } - #[doc(alias = "pango_font_description_set_weight")] pub fn set_weight(&mut self, weight: Weight) { unsafe { diff --git a/pango/src/auto/versions.txt b/pango/src/auto/versions.txt index 1a56b9ecf195..ebdad18d0acb 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 @ be3ecc201d39) -from gir-files (https://github.com/gtk-rs/gir-files @ 3ede86d6a218) +Generated by gir (https://github.com/gtk-rs/gir @ 3491754499c3) +from gir-files (https://github.com/gtk-rs/gir-files @ ced5802891b1) diff --git a/pango/sys/src/lib.rs b/pango/sys/src/lib.rs index 87b551ac3a66..a6164829ce49 100644 --- a/pango/sys/src/lib.rs +++ b/pango/sys/src/lib.rs @@ -348,6 +348,9 @@ pub type PangoWrapMode = c_int; pub const PANGO_WRAP_WORD: PangoWrapMode = 0; pub const PANGO_WRAP_CHAR: PangoWrapMode = 1; pub const PANGO_WRAP_WORD_CHAR: PangoWrapMode = 2; +#[cfg(feature = "v1_56")] +#[cfg_attr(docsrs, doc(cfg(feature = "v1_56")))] +pub const PANGO_WRAP_NONE: PangoWrapMode = 3; // Constants pub const PANGO_ANALYSIS_FLAG_CENTERED_BASELINE: c_int = 1; @@ -369,7 +372,12 @@ pub const PANGO_FONT_MASK_WEIGHT: PangoFontMask = 8; pub const PANGO_FONT_MASK_STRETCH: PangoFontMask = 16; pub const PANGO_FONT_MASK_SIZE: PangoFontMask = 32; pub const PANGO_FONT_MASK_GRAVITY: PangoFontMask = 64; +#[cfg(feature = "v1_42")] +#[cfg_attr(docsrs, doc(cfg(feature = "v1_42")))] pub const PANGO_FONT_MASK_VARIATIONS: PangoFontMask = 128; +#[cfg(feature = "v1_56")] +#[cfg_attr(docsrs, doc(cfg(feature = "v1_56")))] +pub const PANGO_FONT_MASK_FEATURES: PangoFontMask = 256; pub type PangoLayoutDeserializeFlags = c_uint; pub const PANGO_LAYOUT_DESERIALIZE_DEFAULT: PangoLayoutDeserializeFlags = 0; @@ -1760,6 +1768,9 @@ extern "C" { ) -> gboolean; pub fn pango_font_description_free(desc: *mut PangoFontDescription); pub fn pango_font_description_get_family(desc: *const PangoFontDescription) -> *const c_char; + #[cfg(feature = "v1_56")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_56")))] + pub fn pango_font_description_get_features(desc: *const PangoFontDescription) -> *const c_char; pub fn pango_font_description_get_gravity(desc: *const PangoFontDescription) -> PangoGravity; pub fn pango_font_description_get_set_fields( desc: *const PangoFontDescription, @@ -1800,6 +1811,18 @@ extern "C" { desc: *mut PangoFontDescription, family: *const c_char, ); + #[cfg(feature = "v1_56")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_56")))] + pub fn pango_font_description_set_features( + desc: *mut PangoFontDescription, + features: *const c_char, + ); + #[cfg(feature = "v1_56")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_56")))] + pub fn pango_font_description_set_features_static( + desc: *mut PangoFontDescription, + features: *const c_char, + ); pub fn pango_font_description_set_gravity( desc: *mut PangoFontDescription, gravity: PangoGravity, diff --git a/pango/sys/tests/abi.rs b/pango/sys/tests/abi.rs index 5ae1c65f259d..8eb4b5e10a6d 100644 --- a/pango/sys/tests/abi.rs +++ b/pango/sys/tests/abi.rs @@ -747,6 +747,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("(gint) PANGO_ELLIPSIZE_NONE", "0"), ("(gint) PANGO_ELLIPSIZE_START", "1"), ("(guint) PANGO_FONT_MASK_FAMILY", "1"), + ("(guint) PANGO_FONT_MASK_FEATURES", "256"), ("(guint) PANGO_FONT_MASK_GRAVITY", "64"), ("(guint) PANGO_FONT_MASK_SIZE", "32"), ("(guint) PANGO_FONT_MASK_STRETCH", "16"), @@ -957,6 +958,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("(gint) PANGO_WEIGHT_ULTRAHEAVY", "1000"), ("(gint) PANGO_WEIGHT_ULTRALIGHT", "200"), ("(gint) PANGO_WRAP_CHAR", "1"), + ("(gint) PANGO_WRAP_NONE", "3"), ("(gint) PANGO_WRAP_WORD", "0"), ("(gint) PANGO_WRAP_WORD_CHAR", "2"), ]; diff --git a/pango/sys/tests/constant.c b/pango/sys/tests/constant.c index 2dca68c78b31..be70f9e2a096 100644 --- a/pango/sys/tests/constant.c +++ b/pango/sys/tests/constant.c @@ -116,6 +116,7 @@ int main() { PRINT_CONSTANT((gint) PANGO_ELLIPSIZE_NONE); PRINT_CONSTANT((gint) PANGO_ELLIPSIZE_START); PRINT_CONSTANT((guint) PANGO_FONT_MASK_FAMILY); + PRINT_CONSTANT((guint) PANGO_FONT_MASK_FEATURES); PRINT_CONSTANT((guint) PANGO_FONT_MASK_GRAVITY); PRINT_CONSTANT((guint) PANGO_FONT_MASK_SIZE); PRINT_CONSTANT((guint) PANGO_FONT_MASK_STRETCH); @@ -326,6 +327,7 @@ int main() { PRINT_CONSTANT((gint) PANGO_WEIGHT_ULTRAHEAVY); PRINT_CONSTANT((gint) PANGO_WEIGHT_ULTRALIGHT); PRINT_CONSTANT((gint) PANGO_WRAP_CHAR); + PRINT_CONSTANT((gint) PANGO_WRAP_NONE); PRINT_CONSTANT((gint) PANGO_WRAP_WORD); PRINT_CONSTANT((gint) PANGO_WRAP_WORD_CHAR); return 0; diff --git a/pango/sys/versions.txt b/pango/sys/versions.txt index 1a56b9ecf195..ebdad18d0acb 100644 --- a/pango/sys/versions.txt +++ b/pango/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ be3ecc201d39) -from gir-files (https://github.com/gtk-rs/gir-files @ 3ede86d6a218) +Generated by gir (https://github.com/gtk-rs/gir @ 3491754499c3) +from gir-files (https://github.com/gtk-rs/gir-files @ ced5802891b1) diff --git a/pangocairo/src/auto/versions.txt b/pangocairo/src/auto/versions.txt index 1a56b9ecf195..ebdad18d0acb 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 @ be3ecc201d39) -from gir-files (https://github.com/gtk-rs/gir-files @ 3ede86d6a218) +Generated by gir (https://github.com/gtk-rs/gir @ 3491754499c3) +from gir-files (https://github.com/gtk-rs/gir-files @ ced5802891b1) diff --git a/pangocairo/sys/versions.txt b/pangocairo/sys/versions.txt index 1a56b9ecf195..ebdad18d0acb 100644 --- a/pangocairo/sys/versions.txt +++ b/pangocairo/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ be3ecc201d39) -from gir-files (https://github.com/gtk-rs/gir-files @ 3ede86d6a218) +Generated by gir (https://github.com/gtk-rs/gir @ 3491754499c3) +from gir-files (https://github.com/gtk-rs/gir-files @ ced5802891b1)