Skip to content

gdk-pixbuf: Add v2_44 version feature #1755

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 5 commits into from
Jun 30, 2025
Merged

gdk-pixbuf: Add v2_44 version feature #1755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34285cc
gdk-pixbuf: Add v2_44 version feature
sdroege Jun 30, 2025
f56ae65
glib-macros: Fix various new 1.88 clippy warnings
sdroege Jun 30, 2025
975aac3
gio: Fix some new 1.88 clippy warnings
sdroege Jun 30, 2025
34b8e11
Update gir
sdroege Jun 30, 2025
d9f949b
Regenerate with latest gir
sdroege Jun 30, 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
1 change: 1 addition & 0 deletions gdk-pixbuf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ name = "gdk_pixbuf"
[features]
v2_40 = ["gdk-pixbuf-sys/v2_40"]
v2_42 = ["v2_40", "gdk-pixbuf-sys/v2_42"]
v2_44 = ["v2_42", "gdk-pixbuf-sys/v2_44"]

[dependencies]
gdk-pixbuf-sys.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion 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 @ 3fcec321a85e)
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)
2 changes: 1 addition & 1 deletion gdk-pixbuf/sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ version = "2.40"
version = "2.42"

[package.metadata.system-deps.gdk_pixbuf_2_0.v2_44]
version = "2.44"
version = "2.43"

[package.metadata.docs.rs]
rustc-args = ["--cfg", "docsrs"]
Expand Down
2 changes: 1 addition & 1 deletion 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 @ 3fcec321a85e)
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)
8 changes: 4 additions & 4 deletions gio/src/auto/desktop_app_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ impl DesktopAppInfo {
launch_context: Option<&impl IsA<AppLaunchContext>>,
spawn_flags: glib::SpawnFlags,
user_setup: Option<Box_<dyn FnOnce() + 'static>>,
pid_callback: Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))>,
pid_callback: Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)>,
) -> Result<(), glib::Error> {
let user_setup_data: Box_<Option<Box_<dyn FnOnce() + 'static>>> = Box_::new(user_setup);
unsafe extern "C" fn user_setup_func(data: glib::ffi::gpointer) {
Expand All @@ -218,7 +218,7 @@ impl DesktopAppInfo {
} else {
None
};
let mut pid_callback_data: Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))> =
let mut pid_callback_data: Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)> =
pid_callback;
unsafe extern "C" fn pid_callback_func(
appinfo: *mut ffi::GDesktopAppInfo,
Expand All @@ -227,7 +227,7 @@ impl DesktopAppInfo {
) {
let appinfo = from_glib_borrow(appinfo);
let pid = from_glib(pid);
let callback = user_data as *mut Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))>;
let callback = user_data as *mut Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)>;
if let Some(ref mut callback) = *callback {
callback(&appinfo, pid)
} else {
Expand All @@ -240,7 +240,7 @@ impl DesktopAppInfo {
None
};
let super_callback0: Box_<Option<Box_<dyn FnOnce() + 'static>>> = user_setup_data;
let super_callback1: &mut Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))> =
let super_callback1: &mut Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)> =
&mut pid_callback_data;
unsafe {
let mut error = std::ptr::null_mut();
Expand Down
16 changes: 8 additions & 8 deletions gio/src/auto/file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,15 +222,15 @@ pub trait FileExt: IsA<File> + 'static {
destination: &impl IsA<File>,
flags: FileCopyFlags,
cancellable: Option<&impl IsA<Cancellable>>,
progress_callback: Option<&mut dyn (FnMut(i64, i64))>,
progress_callback: Option<&mut dyn FnMut(i64, i64)>,
) -> Result<(), glib::Error> {
let mut progress_callback_data: Option<&mut dyn (FnMut(i64, i64))> = progress_callback;
let mut progress_callback_data: Option<&mut dyn FnMut(i64, i64)> = progress_callback;
unsafe extern "C" fn progress_callback_func(
current_num_bytes: i64,
total_num_bytes: i64,
data: glib::ffi::gpointer,
) {
let callback = data as *mut Option<&mut dyn (FnMut(i64, i64))>;
let callback = data as *mut Option<&mut dyn FnMut(i64, i64)>;
if let Some(ref mut callback) = *callback {
callback(current_num_bytes, total_num_bytes)
} else {
Expand All @@ -242,7 +242,7 @@ pub trait FileExt: IsA<File> + 'static {
} else {
None
};
let super_callback0: &mut Option<&mut dyn (FnMut(i64, i64))> = &mut progress_callback_data;
let super_callback0: &mut Option<&mut dyn FnMut(i64, i64)> = &mut progress_callback_data;
unsafe {
let mut error = std::ptr::null_mut();
let is_ok = ffi::g_file_copy(
Expand Down Expand Up @@ -1246,15 +1246,15 @@ pub trait FileExt: IsA<File> + 'static {
destination: &impl IsA<File>,
flags: FileCopyFlags,
cancellable: Option<&impl IsA<Cancellable>>,
progress_callback: Option<&mut dyn (FnMut(i64, i64))>,
progress_callback: Option<&mut dyn FnMut(i64, i64)>,
) -> Result<(), glib::Error> {
let mut progress_callback_data: Option<&mut dyn (FnMut(i64, i64))> = progress_callback;
let mut progress_callback_data: Option<&mut dyn FnMut(i64, i64)> = progress_callback;
unsafe extern "C" fn progress_callback_func(
current_num_bytes: i64,
total_num_bytes: i64,
data: glib::ffi::gpointer,
) {
let callback = data as *mut Option<&mut dyn (FnMut(i64, i64))>;
let callback = data as *mut Option<&mut dyn FnMut(i64, i64)>;
if let Some(ref mut callback) = *callback {
callback(current_num_bytes, total_num_bytes)
} else {
Expand All @@ -1266,7 +1266,7 @@ pub trait FileExt: IsA<File> + 'static {
} else {
None
};
let super_callback0: &mut Option<&mut dyn (FnMut(i64, i64))> = &mut progress_callback_data;
let super_callback0: &mut Option<&mut dyn FnMut(i64, i64)> = &mut progress_callback_data;
unsafe {
let mut error = std::ptr::null_mut();
let is_ok = ffi::g_file_move(
Expand Down
2 changes: 1 addition & 1 deletion 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 @ 3fcec321a85e)
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)
8 changes: 4 additions & 4 deletions gio/src/desktop_app_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ pub trait DesktopAppInfoExtManual: IsA<DesktopAppInfo> {
launch_context: Option<&P>,
spawn_flags: glib::SpawnFlags,
user_setup: Option<Box_<dyn FnOnce() + 'static>>,
pid_callback: Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))>,
pid_callback: Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)>,
stdin_fd: Option<impl AsFd>,
stdout_fd: Option<impl AsFd>,
stderr_fd: Option<impl AsFd>,
Expand All @@ -71,15 +71,15 @@ pub trait DesktopAppInfoExtManual: IsA<DesktopAppInfo> {
} else {
None
};
let pid_callback_data: Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))> = pid_callback;
let pid_callback_data: Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)> = pid_callback;
unsafe extern "C" fn pid_callback_func(
appinfo: *mut ffi::GDesktopAppInfo,
pid: glib::ffi::GPid,
user_data: glib::ffi::gpointer,
) {
let appinfo = from_glib_borrow(appinfo);
let pid = from_glib(pid);
let callback = user_data as *mut Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))>;
let callback = user_data as *mut Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)>;
if let Some(ref mut callback) = *callback {
callback(&appinfo, pid)
} else {
Expand All @@ -92,7 +92,7 @@ pub trait DesktopAppInfoExtManual: IsA<DesktopAppInfo> {
None
};
let super_callback0: Box_<Option<Box_<dyn FnOnce() + 'static>>> = user_setup_data;
let super_callback1: &Option<&mut dyn (FnMut(&DesktopAppInfo, glib::Pid))> =
let super_callback1: &Option<&mut dyn FnMut(&DesktopAppInfo, glib::Pid)> =
&pid_callback_data;

let stdin_raw_fd = stdin_fd.map_or(-1, |fd| fd.as_fd().as_raw_fd());
Expand Down
2 changes: 1 addition & 1 deletion 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 @ 3fcec321a85e)
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)
2 changes: 1 addition & 1 deletion gir
Open in desktop
Submodule gir updated 28 files
+1 −1 src/analysis/child_properties.rs
+2 −2 src/analysis/ffi_type.rs
+1 −1 src/analysis/object.rs
+1 −1 src/analysis/out_parameters.rs
+3 −10 src/analysis/properties.rs
+1 −1 src/analysis/record.rs
+1 −1 src/analysis/rust_type.rs
+7 −9 src/codegen/doc/format.rs
+1 −1 src/codegen/general.rs
+2 −6 src/codegen/mod.rs
+1 −1 src/codegen/objects.rs
+1 −1 src/codegen/records.rs
+2 −2 src/codegen/sys/build.rs
+5 −5 src/codegen/sys/ffi_type.rs
+1 −1 src/codegen/sys/lib_.rs
+4 −4 src/codegen/sys/tests.rs
+6 −4 src/codegen/trampoline.rs
+4 −7 src/config/child_properties.rs
+1 −4 src/config/constants.rs
+1 −1 src/config/derives.rs
+9 −23 src/config/functions.rs
+11 −24 src/config/gobjects.rs
+2 −6 src/config/ident.rs
+1 −4 src/config/members.rs
+2 −5 src/config/properties.rs
+3 −9 src/config/signals.rs
+1 −4 src/config/virtual_methods.rs
+1 −1 src/library_postprocessing.rs
7 changes: 3 additions & 4 deletions glib-macros/src/clone.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,7 @@ impl Capture {
CaptureKind::Weak => match weak_upgrade_failure_kind {
UpgradeBehaviour::Panic => {
let err_msg = format!(
"Failed to upgrade `{}`. If you don't want to panic, use `#[upgrade_or]`, `#[upgrade_or_else]` or `#[upgrade_or_default]`",
alias,
"Failed to upgrade `{alias}`. If you don't want to panic, use `#[upgrade_or]`, `#[upgrade_or_else]` or `#[upgrade_or_default]`",
);
quote! {
let Some(#alias) = #crate_ident::clone::Upgrade::upgrade(&#alias) else {
Expand All @@ -278,7 +277,7 @@ impl Capture {
UpgradeBehaviour::Default
| UpgradeBehaviour::Expression(_)
| UpgradeBehaviour::Closure(_) => {
let err_msg = format!("Failed to upgrade `{}`", alias);
let err_msg = format!("Failed to upgrade `{alias}`");
quote! {
let Some(#alias) = #crate_ident::clone::Upgrade::upgrade(&#alias) else {
#crate_ident::g_debug!(
Expand All @@ -290,7 +289,7 @@ impl Capture {
}
}
UpgradeBehaviour::Unit => {
let err_msg = format!("Failed to upgrade `{}`", alias);
let err_msg = format!("Failed to upgrade `{alias}`");
let unit_return = unit_return.unwrap_or_else(|| {
quote! { return; }
});
Expand Down
4 changes: 2 additions & 2 deletions glib-macros/tests/properties.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,14 +173,14 @@ mod foo {
String::from("Hello world!")
}
fn set_fizz(&self, value: String) {
*self.fizz.borrow_mut() = format!("custom set: {}", value);
*self.fizz.borrow_mut() = format!("custom set: {value}");
}
fn overridden(&self) -> u32 {
43
}
fn set_construct_only_custom(&self, value: Option<String>) {
self.construct_only_custom_setter
.set(value.map(|v| format!("custom set: {}", v)))
.set(value.map(|v| format!("custom set: {v}")))
.expect("Setter to be only called once");
}
}
Expand Down
2 changes: 1 addition & 1 deletion 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 @ 3fcec321a85e)
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)
2 changes: 1 addition & 1 deletion glib/src/auto/functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ pub fn spawn_command_line_async(
//}

//#[doc(alias = "g_spawn_sync")]
//pub fn spawn_sync(working_directory: Option<impl AsRef<std::path::Path>>, argv: &[&std::path::Path], envp: &[&std::path::Path], flags: SpawnFlags, child_setup: Option<&mut dyn (FnMut())>, standard_output: Vec<u8>, standard_error: Vec<u8>) -> Result<i32, crate::Error> {
//pub fn spawn_sync(working_directory: Option<impl AsRef<std::path::Path>>, argv: &[&std::path::Path], envp: &[&std::path::Path], flags: SpawnFlags, child_setup: Option<&mut dyn FnMut()>, standard_output: Vec<u8>, standard_error: Vec<u8>) -> Result<i32, crate::Error> {
// unsafe { TODO: call ffi:g_spawn_sync() }
//}

Expand Down
2 changes: 1 addition & 1 deletion 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 @ 3fcec321a85e)
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)
2 changes: 1 addition & 1 deletion 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 @ 3fcec321a85e)
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)
2 changes: 1 addition & 1 deletion 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 @ 3fcec321a85e)
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)
2 changes: 1 addition & 1 deletion 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 @ 3fcec321a85e)
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)
2 changes: 1 addition & 1 deletion 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 @ 3fcec321a85e)
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)
2 changes: 1 addition & 1 deletion pango/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 @ 3fcec321a85e)
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)
2 changes: 1 addition & 1 deletion pangocairo/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 @ 3fcec321a85e)
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)
2 changes: 1 addition & 1 deletion pangocairo/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 @ 3fcec321a85e)
Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
from gir-files (https://github.com/gtk-rs/gir-files @ e9775ea8223a)
Loading