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

glutin update #8172

Closed
wants to merge 1 commit into from
Closed

glutin update #8172

wants to merge 1 commit into from

Conversation

paulrouget
Copy link
Contributor

Please take a look at the change in ports/glutin/Cargo.toml (other changes come from the cargo-update command). Glutin doesn't have a window feature anymore.

Review on Reviewable

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Oct 23, 2015
@frewsxcv
Copy link
Contributor

./components/servo/Cargo.lock:716: conflicting versions for package "khronos_api"

    expected maximum version "0.0.8"

    but, "gl_generator" demands "0.0.7"

    try upgrading with ./mach cargo-update -p khronos_api:0.0.7

./components/servo/Cargo.lock:726: conflicting versions for package "gl_common"

    expected maximum version "0.1.0"

    but, "gleam" demands "0.0.4"

    try upgrading with ./mach cargo-update -p gl_common:0.0.4

./components/servo/Cargo.lock:727: conflicting versions for package "gl_generator"

    expected maximum version "0.1.0"

    but, "gleam" demands "0.0.28"

    try upgrading with ./mach cargo-update -p gl_generator:0.0.28

./components/servo/Cargo.lock:795: conflicting versions for package "gl_common"

    expected maximum version "0.1.0"

    but, "glx" demands "0.0.4"

    try upgrading with ./mach cargo-update -p gl_common:0.0.4

./components/servo/Cargo.lock:796: conflicting versions for package "gl_generator"

    expected maximum version "0.1.0"

    but, "glx" demands "0.0.28"

    try upgrading with ./mach cargo-update -p gl_generator:0.0.28

./components/servo/Cargo.lock:1302: conflicting versions for package "gl_generator"

    expected maximum version "0.1.0"

    but, "offscreen_gl_context" demands "0.0.28"

    try upgrading with ./mach cargo-update -p gl_generator:0.0.28

@mbrubeck
Copy link
Contributor

Submitted PR servo/surfman#35 to get everything on the latest version of gl_generator.

Once that is merged, then updating to the latest versions of offscreen_gl_context, gleam, and gl_common should fix the multiple versions.

@nox nox added S-fails-tidy `./mach test-tidy` reported errors. S-blocked-on-external Something, somewhere else, needs to happen before this PR can be merged. and removed S-fails-tidy `./mach test-tidy` reported errors. labels Oct 24, 2015
@frewsxcv
Copy link
Contributor

Update: servo/surfman#35 has merged

@frewsxcv frewsxcv added S-needs-code-changes Changes have not yet been made that were requested by a reviewer. and removed S-awaiting-review There is new code that needs to be reviewed. S-blocked-on-external Something, somewhere else, needs to happen before this PR can be merged. labels Oct 25, 2015
@mbrubeck
Copy link
Contributor

Moved to #8224.

@mbrubeck mbrubeck closed this Oct 27, 2015
bors-servo pushed a commit that referenced this pull request Oct 27, 2015
Upgrade glutin and related packages

Updated version of #8172.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8224)
<!-- Reviewable:end -->
bors-servo pushed a commit that referenced this pull request Oct 27, 2015
Upgrade glutin and related packages

Updated version of #8172.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8224)
<!-- Reviewable:end -->
bors-servo pushed a commit that referenced this pull request Oct 27, 2015
Upgrade glutin and related packages

Updated version of #8172.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8224)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-needs-code-changes Changes have not yet been made that were requested by a reviewer.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants