Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert glutin upgrade. #23442

Merged
merged 4 commits into from May 23, 2019
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev

Revert "Glutin update: dependencies update"

This reverts commit 30fb18e.
  • Loading branch information
jdm committed May 22, 2019
commit 60688da71aff41b09e8bfb35c3f0c9c07f54e822

Large diffs are not rendered by default.

@@ -30,5 +30,5 @@ lazy_static = "1.0"
mach = "0.2.3"

[target.'cfg(all(target_os = "linux", not(any(target_arch = "arm", target_arch = "aarch64"))))'.dependencies]
nix = "0.13"
nix = "~0.11.0"
unwind-sys = "0.1.1"
@@ -21,7 +21,7 @@ compositing = {path = "../compositing"}
cssparser = "0.25"
euclid = "0.19"
fnv = "1.0"
gleam = "0.6.7"
gleam = "0.6.4"
half = "1"
ipc-channel = "0.11"
log = "0.4"
@@ -33,7 +33,7 @@ msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
num-traits = "0.2"
ordered-float = "1.0"
parking_lot = "0.7"
parking_lot = "0.6"
profile_traits = {path = "../profile_traits"}
range = {path = "../range"}
rayon = "1"
@@ -36,7 +36,7 @@ malloc_size_of = { path = "../malloc_size_of" }
metrics = {path = "../metrics"}
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
parking_lot = "0.7"
parking_lot = "0.6"
profile_traits = {path = "../profile_traits"}
range = {path = "../range"}
rayon = "1"
@@ -79,7 +79,7 @@ mime_guess = "2.0.0-alpha.6"
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
num-traits = "0.2"
parking_lot = "0.7"
parking_lot = "0.6"
phf = "0.7.18"
pixels = {path = "../pixels"}
profile_traits = {path = "../profile_traits"}
@@ -53,7 +53,7 @@ num-traits = "0.2"
num-derive = "0.2"
ordered-float = "1.0"
owning_ref = "0.4"
parking_lot = "0.7"
parking_lot = "0.6"
precomputed-hash = "0.1.1"
rayon = "1"
selectors = { path = "../selectors" }
@@ -22,7 +22,7 @@ gleam = "0.6"
ipc-channel = "0.11"
log = "0.4"
msg = {path = "../msg"}
rust-webvr = {version = "0.11", features = ["openvr", "vrexternal"]}
rust-webvr = {version = "=0.11.0", features = ["openvr", "vrexternal"]}
script_traits = {path = "../script_traits"}
servo_config = {path = "../config"}
webvr_traits = {path = "../webvr_traits" }
@@ -13,5 +13,5 @@ path = "lib.rs"
[dependencies]
ipc-channel = "0.11"
msg = {path = "../msg"}
rust-webvr-api = {version = "0.11", features = ["ipc"]}
rust-webvr-api = {version = "=0.11.0", features = ["ipc"]}
serde = "1.0"
@@ -46,13 +46,13 @@ bitflags = "1.0"
crossbeam-channel = "0.3"
euclid = "0.19"
gleam = "0.6"
glutin = "0.21.0"
glutin = "0.19"
keyboard-types = "0.4.3"
lazy_static = "1"
libservo = {path = "../../components/servo"}
libc = "0.2"
log = "0.4"
rust-webvr = { version = "0.11", features = ["glwindow"] }
rust-webvr = { version = "=0.11.0", features = ["glwindow"] }
tinyfiledialogs = "3.0"

[target.'cfg(any(target_os = "linux", target_os = "windows"))'.dependencies]
@@ -23,7 +23,7 @@ winapi = "0.3.2"
libloading = "0.5"

[build-dependencies]
gl_generator = "0.11"
gl_generator = "0.10"

[features]
default = ["unstable", "default-except-unstable"]
@@ -15,7 +15,7 @@ app_units = "0.7"
cssparser = "0.25"
euclid = "0.19"
html5ever = "0.23"
parking_lot = "0.7"
parking_lot = "0.6"
rayon = "1"
serde_json = "1.0"
selectors = {path = "../../../components/selectors"}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.