From c6a4bdb787faf6b6a4b225c02428b6e9237ba813 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 22 May 2015 21:11:08 -0400 Subject: [PATCH 1/4] x11 version bump --- components/servo/Cargo.lock | 10 +++++----- ports/cef/Cargo.lock | 12 ++++++------ ports/gonk/Cargo.lock | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 73a1c7b5a098..e4b4b3c14d42 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -460,7 +460,7 @@ dependencies = [ "osmesa-sys 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -481,7 +481,7 @@ dependencies = [ "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "x11 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -631,7 +631,7 @@ dependencies = [ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", - "x11 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -859,7 +859,7 @@ dependencies = [ "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1336,7 +1336,7 @@ dependencies = [ [[package]] name = "x11" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 31babf1132f7..d6a56dc4dba7 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -29,7 +29,7 @@ dependencies = [ "style 0.0.1", "url 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "x11 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -462,7 +462,7 @@ dependencies = [ "osmesa-sys 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -483,7 +483,7 @@ dependencies = [ "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "x11 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -633,7 +633,7 @@ dependencies = [ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", - "x11 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -849,7 +849,7 @@ dependencies = [ "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1321,7 +1321,7 @@ dependencies = [ [[package]] name = "x11" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index b69d7fe34aa7..bdcc1527588d 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -541,7 +541,7 @@ dependencies = [ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", - "x11 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -740,7 +740,7 @@ dependencies = [ "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1185,7 +1185,7 @@ dependencies = [ [[package]] name = "x11" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", From fcb5cf9c6d8a075b0a942c47806bea446ff89f58 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sat, 23 May 2015 08:39:37 -0400 Subject: [PATCH 2/4] update offscreen_gl_context --- components/servo/Cargo.lock | 2 +- ports/cef/Cargo.lock | 2 +- ports/gonk/Cargo.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index e4b4b3c14d42..d32b61b57a60 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -849,7 +849,7 @@ dependencies = [ [[package]] name = "offscreen_gl_context" version = "0.0.1" -source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#71d5dbd838f7038feb9b366ec5a95503bb81039f" +source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#99cee719a811f28e70fe33fa71137663ac210487" dependencies = [ "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)", "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index d6a56dc4dba7..bace045caf9c 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -839,7 +839,7 @@ dependencies = [ [[package]] name = "offscreen_gl_context" version = "0.0.1" -source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#71d5dbd838f7038feb9b366ec5a95503bb81039f" +source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#99cee719a811f28e70fe33fa71137663ac210487" dependencies = [ "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)", "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index bdcc1527588d..3631b0e431db 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -730,7 +730,7 @@ dependencies = [ [[package]] name = "offscreen_gl_context" version = "0.0.1" -source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#71d5dbd838f7038feb9b366ec5a95503bb81039f" +source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#99cee719a811f28e70fe33fa71137663ac210487" dependencies = [ "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)", "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", From 8799213d4a555c87e09931b0bdc5979f05b87315 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sat, 23 May 2015 09:03:42 -0400 Subject: [PATCH 3/4] fix build --- ports/glutin/window.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs index 5da1b03fb7d9..726ddf97ba34 100644 --- a/ports/glutin/window.rs +++ b/ports/glutin/window.rs @@ -688,7 +688,7 @@ impl WindowMethods for Window { fn set_cursor(&self, _: Cursor) { } - fn prepare_for_composite(&self) -> bool { + fn prepare_for_composite(&self, _width: usize, _height: usize) -> bool { true } From c884b43b712fa020e69218dbfa3fc4d29e2cfede Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sun, 24 May 2015 19:53:44 -0400 Subject: [PATCH 4/4] another glutin update --- components/servo/Cargo.lock | 2 +- ports/cef/Cargo.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index d32b61b57a60..53b16cd25409 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "glutin" version = "0.0.26" -source = "git+https://github.com/servo/glutin?branch=servo#ec7a5e40c1cc7b8176eb1e1f7bf70c8a19559400" +source = "git+https://github.com/servo/glutin?branch=servo#e888dc79471f062ae0b5fae0ba9e0f01ac96048e" dependencies = [ "android_glue 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index bace045caf9c..5aed32ef3339 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -445,7 +445,7 @@ dependencies = [ [[package]] name = "glutin" version = "0.0.26" -source = "git+https://github.com/servo/glutin?branch=servo#ec7a5e40c1cc7b8176eb1e1f7bf70c8a19559400" +source = "git+https://github.com/servo/glutin?branch=servo#e888dc79471f062ae0b5fae0ba9e0f01ac96048e" dependencies = [ "android_glue 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",