desktop: Add "wayland-data-control" feature for arboard

This fixes a crash on start when running under Wayland.
This commit is contained in:
bi4k8 2023-12-11 10:08:15 +00:00 committed by GitHub
parent 06646bc4b8
commit 4d07e43bc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 188 additions and 14 deletions

200
Cargo.lock generated
View File

@ -223,6 +223,7 @@ dependencies = [
"parking_lot",
"thiserror",
"winapi",
"wl-clipboard-rs",
"x11rb",
]
@ -539,6 +540,12 @@ version = "3.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
[[package]]
name = "bytecount"
version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205"
[[package]]
name = "bytemuck"
version = "1.14.0"
@ -1243,6 +1250,17 @@ dependencies = [
"powerfmt",
]
[[package]]
name = "derive-new"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]]
name = "diff"
version = "0.1.13"
@ -1632,6 +1650,12 @@ dependencies = [
"simd-adler32",
]
[[package]]
name = "fixedbitset"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flash-lso"
version = "0.6.0"
@ -3264,6 +3288,7 @@ dependencies = [
"cfg-if",
"libc",
"memoffset 0.7.1",
"pin-utils",
]
[[package]]
@ -3578,6 +3603,16 @@ dependencies = [
"winapi",
]
[[package]]
name = "os_pipe"
version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177"
dependencies = [
"libc",
"windows-sys 0.48.0",
]
[[package]]
name = "ouroboros"
version = "0.18.0"
@ -3683,6 +3718,16 @@ version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "petgraph"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
dependencies = [
"fixedbitset",
"indexmap 2.1.0",
]
[[package]]
name = "pin-project"
version = "1.1.3"
@ -3909,6 +3954,15 @@ dependencies = [
"bytemuck",
]
[[package]]
name = "quick-xml"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
dependencies = [
"memchr",
]
[[package]]
name = "quick-xml"
version = "0.31.0"
@ -4188,7 +4242,7 @@ dependencies = [
"num-traits",
"percent-encoding",
"png",
"quick-xml",
"quick-xml 0.31.0",
"rand",
"realfft",
"regress",
@ -4812,9 +4866,9 @@ dependencies = [
"memmap2 0.5.10",
"nix 0.24.3",
"pkg-config",
"wayland-client",
"wayland-client 0.29.5",
"wayland-cursor",
"wayland-protocols",
"wayland-protocols 0.29.5",
]
[[package]]
@ -4824,7 +4878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8"
dependencies = [
"smithay-client-toolkit",
"wayland-client",
"wayland-client 0.29.5",
]
[[package]]
@ -5044,6 +5098,19 @@ version = "0.12.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
[[package]]
name = "tempfile"
version = "3.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
dependencies = [
"cfg-if",
"fastrand 2.0.1",
"redox_syscall 0.4.1",
"rustix",
"windows-sys 0.48.0",
]
[[package]]
name = "termcolor"
version = "1.4.0"
@ -5366,6 +5433,20 @@ dependencies = [
"strength_reduce",
]
[[package]]
name = "tree_magic_mini"
version = "3.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91adfd0607cacf6e4babdb870e9bec4037c1c4b151cfd279ccefc5e0c7feaa6d"
dependencies = [
"bytecount",
"fnv",
"lazy_static",
"nom",
"once_cell",
"petgraph",
]
[[package]]
name = "ttf-parser"
version = "0.20.0"
@ -5665,6 +5746,20 @@ version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
[[package]]
name = "wayland-backend"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4"
dependencies = [
"cc",
"downcast-rs",
"nix 0.26.4",
"scoped-tls",
"smallvec",
"wayland-sys 0.31.1",
]
[[package]]
name = "wayland-client"
version = "0.29.5"
@ -5677,8 +5772,20 @@ dependencies = [
"nix 0.24.3",
"scoped-tls",
"wayland-commons",
"wayland-scanner",
"wayland-sys",
"wayland-scanner 0.29.5",
"wayland-sys 0.29.5",
]
[[package]]
name = "wayland-client"
version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3"
dependencies = [
"bitflags 2.4.1",
"nix 0.26.4",
"wayland-backend",
"wayland-scanner 0.31.0",
]
[[package]]
@ -5690,7 +5797,7 @@ dependencies = [
"nix 0.24.3",
"once_cell",
"smallvec",
"wayland-sys",
"wayland-sys 0.29.5",
]
[[package]]
@ -5700,7 +5807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661"
dependencies = [
"nix 0.24.3",
"wayland-client",
"wayland-client 0.29.5",
"xcursor",
]
@ -5711,9 +5818,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6"
dependencies = [
"bitflags 1.3.2",
"wayland-client",
"wayland-client 0.29.5",
"wayland-commons",
"wayland-scanner",
"wayland-scanner 0.29.5",
]
[[package]]
name = "wayland-protocols"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c"
dependencies = [
"bitflags 2.4.1",
"wayland-backend",
"wayland-client 0.31.1",
"wayland-scanner 0.31.0",
]
[[package]]
name = "wayland-protocols-wlr"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
dependencies = [
"bitflags 2.4.1",
"wayland-backend",
"wayland-client 0.31.1",
"wayland-protocols 0.31.0",
"wayland-scanner 0.31.0",
]
[[package]]
@ -5727,6 +5859,17 @@ dependencies = [
"xml-rs",
]
[[package]]
name = "wayland-scanner"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c"
dependencies = [
"proc-macro2",
"quick-xml 0.30.0",
"quote",
]
[[package]]
name = "wayland-sys"
version = "0.29.5"
@ -5738,6 +5881,17 @@ dependencies = [
"pkg-config",
]
[[package]]
name = "wayland-sys"
version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af"
dependencies = [
"dlib",
"log",
"pkg-config",
]
[[package]]
name = "weak-table"
version = "0.3.2"
@ -6214,10 +6368,10 @@ dependencies = [
"sctk-adwaita",
"smithay-client-toolkit",
"wasm-bindgen",
"wayland-client",
"wayland-client 0.29.5",
"wayland-commons",
"wayland-protocols",
"wayland-scanner",
"wayland-protocols 0.29.5",
"wayland-scanner 0.29.5",
"web-sys",
"windows-sys 0.45.0",
"x11-dl",
@ -6251,6 +6405,26 @@ dependencies = [
"winapi",
]
[[package]]
name = "wl-clipboard-rs"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57af79e973eadf08627115c73847392e6b766856ab8e3844a59245354b23d2fa"
dependencies = [
"derive-new",
"libc",
"log",
"nix 0.26.4",
"os_pipe",
"tempfile",
"thiserror",
"tree_magic_mini",
"wayland-backend",
"wayland-client 0.31.1",
"wayland-protocols 0.31.0",
"wayland-protocols-wlr",
]
[[package]]
name = "x11-dl"
version = "2.21.0"

View File

@ -26,7 +26,7 @@ generational-arena = "0.2.9"
winit = "0.28.7"
webbrowser = "0.8.12"
url = "2.5.0"
arboard = "3.3.0"
arboard = { version = "3.3.0", features = ["wayland-data-control"] }
dirs = "5.0"
isahc = { version = "1.7.2", features = ["cookies"] }
rfd = "0.12.1"