From 0f82817c03ebb0f26f3423bbcd48e527ab138cc2 Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Thu, 21 May 2020 01:22:39 +0300 Subject: [PATCH] Update copypasta to v0.7.0 Fixes #3592. --- CHANGELOG.md | 1 + Cargo.lock | 85 ++++++++++++++++++++++++++++++----- alacritty_terminal/Cargo.toml | 2 +- 3 files changed, 77 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 510d0e9..bf49648 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Incorrect location when clicking inside an unfocused window on macOS - Startup mode `Maximized` on Windows - Crash when writing a fullwidth character in the last column with auto-wrap mode disabled +- Paste from some apps on Wayland ## 0.4.2 diff --git a/Cargo.lock b/Cargo.lock index 661f2a2..be5dd21 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -50,7 +50,7 @@ version = "0.5.0-dev" dependencies = [ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "copypasta 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "copypasta 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "font 0.1.0", "libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -350,15 +350,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "copypasta" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "clipboard-win 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "objc_id 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smithay-clipboard 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)", + "smithay-clipboard 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "x11-clipboard 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1180,6 +1179,11 @@ name = "nodrop" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "nom" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "nom" version = "5.1.1" @@ -1806,12 +1810,29 @@ dependencies = [ ] [[package]] -name = "smithay-clipboard" -version = "0.4.0" +name = "smithay-client-toolkit" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smithay-client-toolkit 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-cursor 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-protocols 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "smithay-clipboard" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "smithay-client-toolkit 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2105,6 +2126,17 @@ dependencies = [ "wayland-sys 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "wayland-cursor" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)", + "xcur 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "xcursor 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "wayland-protocols" version = "0.23.6" @@ -2116,6 +2148,17 @@ dependencies = [ "wayland-scanner 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "wayland-protocols" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-commons 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-scanner 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "wayland-scanner" version = "0.23.6" @@ -2304,6 +2347,22 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "xcur" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "xcursor" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "xdg" version = "2.2.0" @@ -2370,7 +2429,7 @@ dependencies = [ "checksum cocoa 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f29f7768b2d1be17b96158e3285951d366b40211320fb30826a76cb7a0da6400" "checksum cocoa 0.20.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8f7b6f3f7f4f0b3ec5c5039aaa9e8c3cef97a7a480a400fd62944841314f293d" "checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -"checksum copypasta 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "865e9675691e2a7dfc806b16ef2dd5dd536e26ea9b8046519767d79be03aeb6a" +"checksum copypasta 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cbc2322d35c17d340f7017e4c1be24c6f0d6e09423adb51d182d7a9c122f2e6c" "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" "checksum core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" @@ -2462,6 +2521,7 @@ dependencies = [ "checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" "checksum nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" "checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" +"checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" "checksum nom 5.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6" "checksum notify 4.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd" "checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" @@ -2537,7 +2597,8 @@ dependencies = [ "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" "checksum smallvec 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" "checksum smithay-client-toolkit 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "421c8dc7acf5cb205b88160f8b4cc2c5cfabe210e43b2f80f009f4c1ef910f1d" -"checksum smithay-clipboard 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "917e8ec7f535cd1a6cbf749c8866c24d67c548a80ac48c8e88a182eab5c07bd1" +"checksum smithay-client-toolkit 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d50df951a0f057399a535c79d082d9d075578ed468498b51c76ff1562afe1d30" +"checksum smithay-clipboard 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f47b17d70d268888e86f03774c8dd7f6afd37010cb6ecc0c2638af6c483b80a5" "checksum socket2 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)" = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" "checksum spsc-buffer 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be6c3f39c37a4283ee4b43d1311c828f2e1fb0541e76ea0cb1a2abd9ef2f5b3b" "checksum static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7f3eb36b47e512f8f1c9e3d10c2c1965bc992bd9cdb024fa581e2194501c83d3" @@ -2574,7 +2635,9 @@ dependencies = [ "checksum wayland-client 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b1d7a5dfc26df8b651cebffeda272b0e444a7485cc83009be2aaffee249d9ea6" "checksum wayland-commons 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "bb66b0d1a27c39bbce712b6372131c6e25149f03ffb0cd017cf8f7de8d66dbdb" "checksum wayland-commons 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3b0ad6f753185c9ad9c7d6daa588b5c42b2531c58a4ba2f2268f81f1aafb0580" +"checksum wayland-cursor 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b823dded13083b2874710af9a7d258a90d44d8501e2c34bb43568b4cc427f47b" "checksum wayland-protocols 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc286643656742777d55dc8e70d144fa4699e426ca8e9d4ef454f4bf15ffcf9" +"checksum wayland-protocols 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d3458a4a34c37220130cce717aa4e4766a6ee8c19a8db1a565e19dc54d666c68" "checksum wayland-scanner 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93b02247366f395b9258054f964fe293ddd019c3237afba9be2ccbe9e1651c3d" "checksum wayland-scanner 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e794b09da468acaeee5f21feb6148ff61a79a6614f6540fe513b060bbb03f1e3" "checksum wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4" @@ -2595,6 +2658,8 @@ dependencies = [ "checksum x11-clipboard 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5e937afd03b64b7be4f959cc044e09260a47241b71e56933f37db097bf7859d" "checksum x11-dl 2.18.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2bf981e3a5b3301209754218f962052d4d9ee97e478f4d26d4a6eced34c1fef8" "checksum xcb 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "62056f63138b39116f82a540c983cc11f1c90cd70b3d492a70c25eaa50bd22a6" +"checksum xcur 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af1879006e82c8f58cf3d1a260434a39c210964e9665fa2f826dc53619201e8b" +"checksum xcursor 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3d227e3d8a9c417b22036b01a2b9a261dfa50306f382d27a469beaf2bbfc9fb1" "checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" "checksum xml-rs 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" "checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d" diff --git a/alacritty_terminal/Cargo.toml b/alacritty_terminal/Cargo.toml index 038bcb4..36b5f65 100644 --- a/alacritty_terminal/Cargo.toml +++ b/alacritty_terminal/Cargo.toml @@ -24,7 +24,7 @@ unicode-width = "0.1" base64 = "0.11.0" terminfo = "0.7.1" url = "2" -copypasta = { version = "0.6.3", default-features = false } +copypasta = { version = "0.7.0", default-features = false } [target.'cfg(unix)'.dependencies] nix = "0.17.0"