Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-01 11:40:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7364 - aweinstock314:update-clipboard-20140825, r=jdm

Browse source 
Update rust-clipboard to a version that works on Windows and Mac.

Possibly completes #5376.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7364)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-25 13:59:45 -06:00
commit ab55e3ec10
3 changed files with 125 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

42
components/servo/Cargo.lock generated
View file

@ -101,6 +101,14 @@ name = "bitflags"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "block"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "byteorder"
version = "0.3.11"
@ -152,18 +160,21 @@ dependencies = [
[[package]]
name = "clipboard"
version = "0.0.2"
source = "git+https://github.com/aweinstock314/rust-clipboard#701fa10b8938da7734556dd85d6eb46f0ff0cede"
version = "0.0.3"
source = "git+https://github.com/aweinstock314/rust-clipboard#b0092c8630d4362e4618533822bea90a034b0792"
dependencies = [
"clipboard-win 1.4.0 (git+https://github.com/DoumanAsh/clipboard-win)",
"clipboard-win 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"objc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"objc-foundation 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"objc_id 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "clipboard-win"
version = "1.4.0"
source = "git+https://github.com/DoumanAsh/clipboard-win#e9f01b5b11a830e9062fc8467cb72d0c49702ce9"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"kernel32-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -197,7 +208,7 @@ dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
"clipboard 0.0.2 (git+https://github.com/aweinstock314/rust-clipboard)",
"clipboard 0.0.3 (git+https://github.com/aweinstock314/rust-clipboard)",
"core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
"devtools_traits 0.0.1",
@ -1097,6 +1108,25 @@ dependencies = [
"malloc_buf 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "objc-foundation"
version = "0.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"block 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"objc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"objc_id 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "objc_id"
version = "0.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"objc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "offscreen_gl_context"
version = "0.1.0"

42
ports/cef/Cargo.lock generated
View file

@ -100,6 +100,14 @@ name = "bitflags"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "block"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "byteorder"
version = "0.3.11"
@ -151,18 +159,21 @@ dependencies = [
[[package]]
name = "clipboard"
version = "0.0.2"
source = "git+https://github.com/aweinstock314/rust-clipboard#701fa10b8938da7734556dd85d6eb46f0ff0cede"
version = "0.0.3"
source = "git+https://github.com/aweinstock314/rust-clipboard#b0092c8630d4362e4618533822bea90a034b0792"
dependencies = [
"clipboard-win 1.4.0 (git+https://github.com/DoumanAsh/clipboard-win)",
"clipboard-win 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"objc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"objc-foundation 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"objc_id 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "clipboard-win"
version = "1.4.0"
source = "git+https://github.com/DoumanAsh/clipboard-win#e9f01b5b11a830e9062fc8467cb72d0c49702ce9"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"kernel32-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -196,7 +207,7 @@ dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
"clipboard 0.0.2 (git+https://github.com/aweinstock314/rust-clipboard)",
"clipboard 0.0.3 (git+https://github.com/aweinstock314/rust-clipboard)",
"core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
"devtools_traits 0.0.1",
@ -1075,6 +1086,25 @@ dependencies = [
"malloc_buf 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "objc-foundation"
version = "0.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"block 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"objc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"objc_id 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "objc_id"
version = "0.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"objc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "offscreen_gl_context"
version = "0.1.0"

59
ports/gonk/Cargo.lock generated
View file

@ -81,6 +81,14 @@ name = "bitflags"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "block"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "byteorder"
version = "0.3.11"
@ -132,18 +140,21 @@ dependencies = [
[[package]]
name = "clipboard"
version = "0.0.2"
source = "git+https://github.com/aweinstock314/rust-clipboard#701fa10b8938da7734556dd85d6eb46f0ff0cede"
version = "0.0.3"
source = "git+https://github.com/aweinstock314/rust-clipboard#b0092c8630d4362e4618533822bea90a034b0792"
dependencies = [
"clipboard-win 1.4.0 (git+https://github.com/DoumanAsh/clipboard-win)",
"clipboard-win 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"objc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"objc-foundation 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"objc_id 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "clipboard-win"
version = "1.4.0"
source = "git+https://github.com/DoumanAsh/clipboard-win#e9f01b5b11a830e9062fc8467cb72d0c49702ce9"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"kernel32-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -166,7 +177,7 @@ dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
"clipboard 0.0.2 (git+https://github.com/aweinstock314/rust-clipboard)",
"clipboard 0.0.3 (git+https://github.com/aweinstock314/rust-clipboard)",
"core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
"devtools_traits 0.0.1",
@ -814,6 +825,14 @@ name = "mac"
version = "0.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "malloc_buf"
version = "0.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "matches"
version = "0.1.2"
@ -933,6 +952,34 @@ dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "objc"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"malloc_buf 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "objc-foundation"
version = "0.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"block 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"objc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"objc_id 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "objc_id"
version = "0.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"objc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "offscreen_gl_context"
version = "0.1.0"