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.

Sign up for GitHub

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

Jump to bottom

Next round of X.org libraries: libICE libSM libXext libXfixes libXi #2265

Merged
merged 5 commits into from
Jan 28, 2017
Merged

Next round of X.org libraries: libICE libSM libXext libXfixes libXi #2265

merged 5 commits into from
Jan 28, 2017

Conversation

pkgw
Copy link
Contributor

@pkgw pkgw commented Jan 22, 2017

No description provided.

@conda-forge-linter
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipes/xorg-libice, recipes/xorg-libsm, recipes/xorg-libxext, recipes/xorg-libxfixes, recipes/xorg-libxi) and found it was in an excellent condition.

pkgw added 4 commits January 23, 2017 08:46
@pkgw
X.org: developing against libx11 requires kbproto
717e51f
@pkgw
X.org: add prototypes as runtime deps for their respective libraries
23c3886 
Not fond of this but we don't have -devel packages, and otherwise there's just going
to be a lot of hassle for building downstream packages.
@pkgw
X.org libsm: libuuid not available on Windows
b5cc589
@pkgw
X.org libICE: fix build on 64-bit Windows
c188ca8 
I guess on 32-bit Windows, `long` and `time_t` are identical types, but
they're not on 64-bit Windows, so `iceauth.c` fails to compile since it
includes a random old-school manual declaration of the `time()` function. The
file unconditionally includes `time.h` so the declaration should be totally
unneccessary — my guess is that code path hasn't been compiled for a looong
time (it's in an #ifdef).
@pkgw pkgw mentioned this pull request Jan 25, 2017
Closed
@pkgw
Copy link
Contributor Author

pkgw commented Jan 25, 2017

OK, this is currently blocked on the fact that xorg-libx11 has python as a build-time dependency, which brings in tk as a dependency, and the tk package on OSX includes dummy versions of X11 headers as per tk issue #15. So, when the OSX xorg-libx11 package is built, it's missing cursorfont.h, Xlib.h, and Xutil.h, which then causes problems when building xorg-libxext here.

tk PR #17 adds xorg-libx11 as a dependency of tk, which (even in its current incomplete form) provides enough headers for tk to build successfully and decide not to install its dummy X11 headers. If that goes through then we can rebuild xorg-libx11 on OSX to get a complete package, and then move forward here.

@jakirkham
Copy link
Member

To try to start unblocking xorg-libx11, you could set always_include_files. That way it will include the headers from xorg-libx11 even if tk provides them. Eventually I'm guessing they can be dropped once tk gets fixed.

@jakirkham jakirkham mentioned this pull request Jan 26, 2017
Open
@pkgw
Copy link
Contributor Author

pkgw commented Jan 28, 2017

Temporarily closing to kick Travis, since I don't think the "Restart build" button is doing anything.

@pkgw pkgw closed this Jan 28, 2017
@pkgw pkgw reopened this Jan 28, 2017
@pkgw
Copy link
Contributor Author

pkgw commented Jan 28, 2017

OK — this builds on OSX with the xorg-libx11 that has the tk workaround in place. Once again, would appreciate a quick merge so I can make more progress while the CI systems are in low demand over the weekend.

@ocefpaf ocefpaf merged commit 0cf8b44 into conda-forge:master Jan 28, 2017
@pkgw pkgw deleted the submission-xorg-round4 branch January 28, 2017 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@pkgw @conda-forge-linter @jakirkham @ocefpaf