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 fe671c6
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 7 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/macos/app_delegate.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::{
cell::{RefCell, RefMut},
mem,
os::raw::c_void,
};

Expand Down Expand Up @@ -72,7 +73,7 @@ extern "C" fn dealloc(this: &Object, _: Sel) {
let state_ptr: *mut c_void = *(this.get_ivar(AUX_DELEGATE_STATE_NAME));
// As soon as the box is constructed it is immediately dropped, releasing the underlying
// memory
Box::from_raw(state_ptr as *mut RefCell<AuxDelegateState>);
mem::drop(Box::from_raw(state_ptr as *mut RefCell<AuxDelegateState>));
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/platform_impl/macos/view.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::{
boxed::Box,
collections::VecDeque,
mem,
os::raw::*,
ptr, slice, str,
sync::{
Expand Down Expand Up @@ -325,7 +326,7 @@ extern "C" fn dealloc(this: &Object, _sel: Sel) {
let marked_text: id = *this.get_ivar("markedText");
let _: () = msg_send![marked_text, release];
let state: *mut c_void = *this.get_ivar("winitState");
Box::from_raw(state as *mut ViewState);
mem::drop(Box::from_raw(state as *mut ViewState));
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/platform_impl/macos/window_delegate.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::{
f64,
f64, mem,
os::raw::c_void,
sync::{Arc, Weak},
};
Expand Down Expand Up @@ -241,7 +241,7 @@ fn with_state<F: FnOnce(&mut WindowDelegateState) -> T, T>(this: &Object, callba

extern "C" fn dealloc(this: &Object, _sel: Sel) {
with_state(this, |state| unsafe {
Box::from_raw(state as *mut WindowDelegateState);
mem::drop(Box::from_raw(state as *mut WindowDelegateState));
});
}

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 fe671c6

Please sign in to comment.