From 3f2dfa521c655dbf98b1e2622b864402f258474a Mon Sep 17 00:00:00 2001 From: rustdesk Date: Mon, 1 Jul 2024 01:43:16 +0800 Subject: [PATCH] fix ci --- Cargo.lock | 2 +- src/common.rs | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 5449fad91..e1f8b39b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -974,7 +974,7 @@ dependencies = [ [[package]] name = "clipboard-master" version = "4.0.0-beta.6" -source = "git+https://github.com/rustdesk-org/clipboard-master#38c0a5c0e5e0cab48abf1209900e3543487fc474" +source = "git+https://github.com/rustdesk-org/clipboard-master#5268c7b3d7728699566ad863da0911f249706f8c" dependencies = [ "objc", "objc-foundation", diff --git a/src/common.rs b/src/common.rs index d4dde6ffb..c3048f314 100644 --- a/src/common.rs +++ b/src/common.rs @@ -8,6 +8,7 @@ use std::{ task::Poll, }; +#[cfg(not(any(target_os = "android", target_os = "ios")))] use clipboard_master::{CallbackResult, ClipboardHandler, Master, Shutdown}; use serde_json::Value; @@ -186,6 +187,7 @@ pub mod input { } lazy_static::lazy_static! { + #[cfg(not(any(target_os = "android", target_os = "ios")))] pub static ref CONTENT: Arc> = Default::default(); pub static ref SOFTWARE_UPDATE_URL: Arc> = Default::default(); } @@ -1497,6 +1499,7 @@ pub fn rustdesk_interval(i: Interval) -> ThrottledInterval { ThrottledInterval::new(i) } +#[cfg(not(any(target_os = "android", target_os = "ios")))] #[derive(Clone)] pub enum ClipboardData { Text(String), @@ -1504,12 +1507,14 @@ pub enum ClipboardData { Empty, } +#[cfg(not(any(target_os = "android", target_os = "ios")))] impl Default for ClipboardData { fn default() -> Self { ClipboardData::Empty } } +#[cfg(not(any(target_os = "android", target_os = "ios")))] impl ClipboardData { fn image(image: arboard::ImageData<'static>) -> ClipboardData { let hash = 0; @@ -1595,6 +1600,7 @@ impl ClipboardData { } } +#[cfg(not(any(target_os = "android", target_os = "ios")))] impl PartialEq for ClipboardData { fn eq(&self, other: &Self) -> bool { match (self, other) {