Feature/conditional x11 #35
Conversation
This fixes cross-compilation. This code is contributed under the terms of the MIT license.
This code is contributed under the terms of the MIT license.
This code is contributed under the terms of the MIT license.
|
Hello! I'm the build bot for the Mono project. I need approval from a Mono team member to build this pull request. A team member should reply with "approve" to approve a build of this pull request, "whitelist" to whitelist this and all future pull requests from this contributor, or "build" to explicitly request a build, even if one has already been done. Contributors can ignore this message. |
|
approve |
|
whitelist |
|
I'm working on getting Mono's System.Drawing to work on .NET Core on OS X. This patch would help building libgdiplus on more recent versions of OS X (which don't have X11). From what I gather, this is a rebased version of #13, which was opened in 2013. Anything I can do to help to have this patch merged? This would also help Homebrew/legacy-homebrew#45393. |
|
It works and is ready to merge. It would seem the people behind this repo has taken a hiatus. |
|
@haf This fix causes the build to fail on Linux, so I'm guessing it can't go in "as is", I'll comment on the diff itself To make the test compile, you would at least need to #ifdef the call to GdipCreateFromXDrawable_linux in |
| @@ -105,8 +105,10 @@ typedef struct _Graphics { | |||
| cairo_t *ct; | |||
| GpMatrix *copy_of_ctm; | |||
| cairo_matrix_t previous_matrix; | |||
| #ifdef CAIRO_HAS_XLIB_SURFACE | |||
| Display *display; | |||
There was a problem hiding this comment.
It looks like Display and Drawable are never used in the codebase (except for setting them to NULL), so I'd guess it'd be better to just remove them alltogether?
|
Conditional X11 would also be a very good thing for headless FreeBSD systems, but I couldn't get the patches to work , especially disabling tests won't work for me. |
|
This was merged with #46. Thanks. |
This PR rebases the PR for compiling without x11 support.