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

[gdk-pixbuf] Fix Linux compilation. #6663

Merged
merged 4 commits into from
Jun 6, 2019

Conversation

Kwizatz
Copy link
Contributor

@Kwizatz Kwizatz commented May 28, 2019

Unlike #6625 this version contains the minimal changes required
to keep other dependencies as untouched as possible.

@NancyLi1013
Copy link
Contributor

Hi @Kwizatz, thanks for your PR. Could you also bump the version in CONTROL file?

@Kwizatz
Copy link
Contributor Author

Kwizatz commented May 29, 2019

@NancyLi1013 Done, I also bumped glib and libcroco's version since they also got small changes.

Unlike microsoft#6625 this version contains the minimal changes required
to keep other dependencies as untouched as possible.
@Kwizatz Kwizatz force-pushed the gdk-pixbuf-fix-linux-minimal branch from 76c7cdd to 318c2eb Compare June 4, 2019 23:41
@Kwizatz
Copy link
Contributor Author

Kwizatz commented Jun 5, 2019

So, I don't see any issues when building gdk-pixbuf on Linux or Windows, so I think the problem may be some other library being affected as a side effect, but I don't know what that could be.

@Rastaban
Copy link
Contributor

Rastaban commented Jun 5, 2019

It looks like qt5-imageformats:x64-windows is failing, although it is not obvious to me what the dependency is between that port and the ones you changed in this PR.

@Kwizatz
Copy link
Contributor Author

Kwizatz commented Jun 5, 2019

Thanks! I'll take a look.

@Rastaban
Copy link
Contributor

Rastaban commented Jun 5, 2019

I am unable to reproduce the failure locally so I am rerunning the tests. It is possible this is an unrelated failure due to other ports not behaving in the CI tests. If that is the case it should be investigated separately so it does not hold up this PR. We will see what the test results are when it finishes.

@Kwizatz
Copy link
Contributor Author

Kwizatz commented Jun 5, 2019

Got the same results, qt5-imageformats:x64-windows built successfully locally. I'll await your results.

@Rastaban
Copy link
Contributor

Rastaban commented Jun 6, 2019

The tests are now passing with the rerun.

@Rastaban Rastaban merged commit db9e1af into microsoft:master Jun 6, 2019
@Kwizatz Kwizatz mentioned this pull request Jun 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants