Skip to content
This repository has been archived by the owner on Jul 10, 2023. It is now read-only.

Re-apply missing win32 patch #52

Merged
merged 2 commits into from
Nov 5, 2015
Merged

Conversation

mbrubeck
Copy link

This was lost in a recent rebase onto upstream master (#51). r? @vvuk

Review on Reviewable

@metajack
Copy link

metajack commented Nov 3, 2015

r? @glennw

@glennw
Copy link
Member

glennw commented Nov 3, 2015

@bors-servo r+

@metajack
Copy link

metajack commented Nov 3, 2015

@bors-servo r=glennw

@bors-servo
Copy link

📌 Commit 4f5be90 has been approved by glennw

@bors-servo
Copy link

⌛ Testing commit 4f5be90 with merge 482570c...

bors-servo pushed a commit that referenced this pull request Nov 3, 2015
Re-apply missing win32 patch

This was lost in a recent rebase onto upstream master (#51). r? @vvuk

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/glutin/52)
<!-- Reviewable:end -->
@bors-servo
Copy link

💔 Test failed - travis

@mbrubeck
Copy link
Author

mbrubeck commented Nov 3, 2015

The failure is because some of glutin's dependencies upgraded to libc 0.2 while others (and glutin itself) are still using libc 0.1.

@metajack
Copy link

metajack commented Nov 3, 2015

Should we move them all to 0.2?

@mbrubeck
Copy link
Author

mbrubeck commented Nov 3, 2015

Yes, we should make all our dependencies require libc 0.2. Currently Servo includes sixty-seven crates that depend on libc = "*" or libc = "0.1".

As a temporary measure we check in a Cargo.lock file in this repo that keeps us on libc 0.1 until everyone has updated to 0.2.

@mbrubeck
Copy link
Author

mbrubeck commented Nov 5, 2015

#53 will fix the Travis build.

@frewsxcv
Copy link

frewsxcv commented Nov 5, 2015

Should this be retried now that #53 has merged?

@jdm
Copy link
Member

jdm commented Nov 5, 2015

@bors-servo: retry

@bors-servo
Copy link

⌛ Testing commit 4f5be90 with merge d4ab289...

bors-servo pushed a commit that referenced this pull request Nov 5, 2015
Re-apply missing win32 patch

This was lost in a recent rebase onto upstream master (#51). r? @vvuk

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/glutin/52)
<!-- Reviewable:end -->
@bors-servo
Copy link

☀️ Test successful - travis

@bors-servo bors-servo merged commit 4f5be90 into servo:servo Nov 5, 2015
bors-servo pushed a commit to servo/servo that referenced this pull request Nov 5, 2015
Upgrade to latest glutin

Includes servo/glutin#52 and servo/glutin#53.

r? @glennw cc @vvuk

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8357)
<!-- Reviewable:end -->
jrmuizel pushed a commit to jrmuizel/gecko-cinnabar that referenced this pull request Jun 12, 2017
…); r=metajack

Includes servo/glutin#52 and servo/glutin#53.

r? @glennw cc @vvuk

Source-Repo: https://github.com/servo/servo
Source-Revision: 65a0bb4aefad7b1cfcce2f5d1f01b081483001e8
gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 1, 2019
…); r=metajack

Includes servo/glutin#52 and servo/glutin#53.

r? glennw cc vvuk

Source-Repo: https://github.com/servo/servo
Source-Revision: 65a0bb4aefad7b1cfcce2f5d1f01b081483001e8

UltraBlame original commit: 26208474bd780eefb73abfcbf16823b1e5d9df65
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified-and-comments-removed that referenced this pull request Oct 1, 2019
…); r=metajack

Includes servo/glutin#52 and servo/glutin#53.

r? glennw cc vvuk

Source-Repo: https://github.com/servo/servo
Source-Revision: 65a0bb4aefad7b1cfcce2f5d1f01b081483001e8

UltraBlame original commit: 26208474bd780eefb73abfcbf16823b1e5d9df65
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified that referenced this pull request Oct 1, 2019
…); r=metajack

Includes servo/glutin#52 and servo/glutin#53.

r? glennw cc vvuk

Source-Repo: https://github.com/servo/servo
Source-Revision: 65a0bb4aefad7b1cfcce2f5d1f01b081483001e8

UltraBlame original commit: 26208474bd780eefb73abfcbf16823b1e5d9df65
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants