Skip to content

Commit

Permalink
Bump sctk-adwaita to 0.4.1
Browse files Browse the repository at this point in the history
This should force the use of system libraries for Fontconfig
and freetype instead of building them with cmake if missing.

Fixes rust-windowing#2373.
  • Loading branch information
kchibisov committed Jul 20, 2022
1 parent 430a49e commit 878c000
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ features = [
wayland-client = { version = "0.29.4", default_features = false, features = ["use_system_lib"], optional = true }
wayland-protocols = { version = "0.29.4", features = [ "staging_protocols"], optional = true }
sctk = { package = "smithay-client-toolkit", version = "0.16.0", default_features = false, features = ["calloop"], optional = true }
sctk-adwaita = { version = "0.4.0", optional = true }
sctk-adwaita = { version = "0.4.1", optional = true }
mio = { version = "0.8", features = ["os-ext"], optional = true }
x11-dl = { version = "2.18.5", optional = true }
percent-encoding = { version = "2.0", optional = true }
Expand Down
3 changes: 2 additions & 1 deletion src/platform_impl/windows/drop_handler.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::{
ffi::{c_void, OsString},
mem,
os::windows::ffi::OsStringExt,
path::PathBuf,
ptr,
Expand Down Expand Up @@ -80,7 +81,7 @@ impl FileDropHandler {
let count = drop_handler.refcount.fetch_sub(1, Ordering::Release) - 1;
if count == 0 {
// Destroy the underlying data
Box::from_raw(drop_handler as *mut FileDropHandlerData);
mem::drop(Box::from_raw(drop_handler as *mut FileDropHandlerData));
}
count as u32
}
Expand Down
2 changes: 1 addition & 1 deletion src/platform_impl/windows/event_loop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ pub(super) unsafe extern "system" fn public_window_callback<T: 'static>(
};

if userdata_removed && recurse_depth == 0 {
Box::from_raw(userdata_ptr);
mem::drop(Box::from_raw(userdata_ptr));
}

result
Expand Down

0 comments on commit 878c000

Please sign in to comment.