Merge branch 'wip/macos-xpc'
* wip/macos-xpc: (23 commits) auth: try switching to platform agnostic auth store daemon: fix crash when misconfigured xpc: better file descriptor handling xpc: adds OpenAttachmentFd xpc: full attachment data sync policy: only ignore empty bodies if there are no attachments xpc: include attachment guids cargo fmt xpc: Some cleanup xpc: refactor -- separate rpc impl and xpc glue xpc: refactor, less chatty logging xpc: Use reply port when replying to RPC messages cargo fmt xpc: implement signals xpc: implement rest of methods in kpcli except signals. cargo fmt xpc: Better type unpacking xpc: implement GetConversations xpc: kpcli: clean up client interface xpc: generic interface for dispatching methods ...
This commit is contained in:
@@ -12,7 +12,7 @@ chrono = "0.4.38"
|
||||
directories = "6.0.0"
|
||||
env_logger = "0.11.6"
|
||||
futures-util = "0.3.31"
|
||||
keyring = { version = "3.6.2", features = ["sync-secret-service"] }
|
||||
keyring = { version = "3.6.3", features = ["apple-native", "sync-secret-service"] }
|
||||
kordophone = { path = "../kordophone" }
|
||||
kordophone-db = { path = "../kordophone-db" }
|
||||
log = "0.4.25"
|
||||
@@ -23,18 +23,25 @@ tokio-condvar = "0.3.0"
|
||||
uuid = "1.16.0"
|
||||
once_cell = "1.19.0"
|
||||
|
||||
[target.'cfg(target_os = "linux")'.dependencies]
|
||||
# D-Bus dependencies only on Linux
|
||||
[target.'cfg(target_os = "linux")'.dependencies]
|
||||
dbus = { version = "0.9.7", features = ["futures"] }
|
||||
dbus-crossroads = "0.5.2"
|
||||
dbus-tokio = "0.7.6"
|
||||
dbus-tree = "0.9.2"
|
||||
|
||||
[target.'cfg(target_os = "linux")'.build-dependencies]
|
||||
# D-Bus codegen only on Linux
|
||||
[target.'cfg(target_os = "linux")'.build-dependencies]
|
||||
dbus-codegen = "0.10.0"
|
||||
dbus-crossroads = "0.5.1"
|
||||
|
||||
# XPC (libxpc) interface for macOS IPC
|
||||
[target.'cfg(target_os = "macos")'.dependencies]
|
||||
block = "0.1.6"
|
||||
futures = "0.3.31"
|
||||
xpc-connection = { git = "https://github.com/dfrankland/xpc-connection-rs.git", rev = "cd4fb3d", package = "xpc-connection" }
|
||||
xpc-connection-sys = { git = "https://github.com/dfrankland/xpc-connection-rs.git", rev = "cd4fb3d", package = "xpc-connection-sys" }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
|
||||
[package.metadata.generate-rpm]
|
||||
assets = [
|
||||
@@ -42,3 +49,4 @@ assets = [
|
||||
{ source = "../target/release/kpcli", dest = "/usr/bin/kpcli", mode = "755" },
|
||||
{ source = "include/net.buzzert.kordophonecd.service", dest = "/usr/share/dbus-1/services/net.buzzert.kordophonecd.service", mode = "644" },
|
||||
]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user