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

Update most dependencies. #6562

Closed
wants to merge 1 commit into from
Closed

Update most dependencies. #6562

wants to merge 1 commit into from

Conversation

@Ms2ger
Copy link
Contributor

Ms2ger commented Jul 6, 2015

This excludes

  • layers, as its latest commits have an API change we still need to adapt to;
  • hyper, as it gained a dependency on the solicit crate, which triggers an ICE
    in the current rustc (rust-lang/rust#26805);
  • websocket, as it depends on a hyper API change;
  • tenacious, as it has not yet been updated to the current rustc
    (Manishearth/rust-tenacious#6).

Unfortunately, this adds a third copy of bitflags to our dependencies; I've
created pull requests to the guilty dependencies:
sfackler/rust-openssl#236 and
servo/cocoa-rs#94.

Review on Reviewable

@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Jul 6, 2015

Critic review: https://critic.hoppipolla.co.uk/r/5473

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.

@jdm
Copy link
Member

jdm commented Jul 6, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Jul 6, 2015

📌 Commit 2533d52 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Jul 6, 2015

Testing commit 2533d52 with merge f15716c...

bors-servo pushed a commit that referenced this pull request Jul 6, 2015
Update most dependencies.

This excludes

* layers, as its latest commits have an API change we still need to adapt to;
* hyper, as it gained a dependency on the solicit crate, which triggers an ICE
  in the current rustc (<rust-lang/rust#26805>);
* websocket, as it depends on a hyper API change;
* tenacious, as it has not yet been updated to the current rustc
  (<Manishearth/rust-tenacious#6>).

Unfortunately, this adds a third copy of bitflags to our dependencies; I've
created pull requests to the guilty dependencies:
<sfackler/rust-openssl#236> and
<servo/cocoa-rs#94>.

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

bors-servo commented Jul 6, 2015

💔 Test failed - android

@jdm
Copy link
Member

jdm commented Jul 6, 2015

--- stderr
In file included from src/skia-c.h:6:0,
                 from src/skia-c.cpp:5:
include/gpu/gl/SkNativeSharedGLContext.h:18:27: fatal error: GLES2/gl2.h: No such file or directory
     #include <GLES2/gl2.h>
This excludes

* layers, as its latest commits have an API change we still need to adapt to;
* hyper, as it gained a dependency on the solicit crate, which triggers an ICE
  in the current rustc (<rust-lang/rust#26805>);
* websocket, as it depends on a hyper API change;
* tenacious, as it has not yet been updated to the current rustc
  (<Manishearth/rust-tenacious#6>).

Unfortunately, this adds a third copy of bitflags to our dependencies; I've
created pull requests to the guilty dependencies:
<sfackler/rust-openssl#236> and
<servo/cocoa-rs#94>.
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jul 6, 2015

@bors-servo r=jdm

@bors-servo
Copy link
Contributor

bors-servo commented Jul 6, 2015

📌 Commit b7dc1cf has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Jul 6, 2015

Testing commit b7dc1cf with merge 9b38c24...

bors-servo pushed a commit that referenced this pull request Jul 6, 2015
Update most dependencies.

This excludes

* layers, as its latest commits have an API change we still need to adapt to;
* hyper, as it gained a dependency on the solicit crate, which triggers an ICE
  in the current rustc (<rust-lang/rust#26805>);
* websocket, as it depends on a hyper API change;
* tenacious, as it has not yet been updated to the current rustc
  (<Manishearth/rust-tenacious#6>).

Unfortunately, this adds a third copy of bitflags to our dependencies; I've
created pull requests to the guilty dependencies:
<sfackler/rust-openssl#236> and
<servo/cocoa-rs#94>.

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

bors-servo commented Jul 6, 2015

💔 Test failed - android

@jdm
Copy link
Member

jdm commented Jul 6, 2015

--- stderr
/home/servo/.cargo/git/checkouts/libfontconfig-3115c6368132e4df/master/src/fcfreetype.c:70:2: warning: #warning "No FT_Get_BDF_Property: Please install freetype 2.1.4 or later" [-Wcpp]
 #warning "No FT_Get_BDF_Property: Please install freetype 2.1.4 or later"
  ^
/home/servo/.cargo/git/checkouts/libfontconfig-3115c6368132e4df/master/src/fcfreetype.c:74:2: warning: #warning "No FT_Get_PS_Font_Info: Please install freetype 2.1.1 or later" [-Wcpp]
 #warning "No FT_Get_PS_Font_Info: Please install freetype 2.1.1 or later"
  ^
/home/servo/.cargo/git/checkouts/libfontconfig-3115c6368132e4df/master/src/fcfreetype.c:1833:2: warning: #warning "No FT_Get_Next_Char: Please install freetype version 2.1.0 or newer" [-Wcpp]
 #warning "No FT_Get_Next_Char: Please install freetype version 2.1.0 or newer"
  ^
/home/servo/.cargo/git/checkouts/libfontconfig-3115c6368132e4df/master/src/fcfreetype.c:895:1: warning: 'FcStringIsConst' defined but not used [-Wunused-function]
 FcStringIsConst (const FcChar8  *string,
 ^
/home/servo/.cargo/git/checkouts/libfontconfig-3115c6368132e4df/master/src/fcfreetype.c:2116:1: warning: 'FcHashGlyphName' defined but not used [-Wunused-function]
 FcHashGlyphName (const FcChar8 *name)
 ^
../src/.libs/libfontconfig.a: error adding symbols: Archive has no index; run ranlib to add one
collect2: error: ld returned 1 exit status
make[3]: *** [fc-cache] Error 1
make[2]: *** [all-recursive] Error 1
make[1]: *** [all] Error 2
make: *** [/home/servo/buildbot/slave/android/build/target/arm-linux-androideabi/debug/build/fontconfig-sys-1f38cf9d1e1a4d19/out/libfontconfig.a] Error 2
@bors-servo
Copy link
Contributor

bors-servo commented Jul 14, 2015

The latest upstream changes (presumably #6626) made this pull request unmergeable. Please resolve the merge conflicts.

@Ms2ger Ms2ger closed this Jul 15, 2015
@Ms2ger Ms2ger deleted the update-all branch Nov 13, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.