Skip to content

Enable freetype for windows - #578

Closed
ldhertert wants to merge 1 commit into
Automattic:masterfrom
ldhertert:master
Closed

ldhertert wants to merge 1 commit into
Automattic:masterfrom
ldhertert:master

Conversation

@ldhertert

Copy link
Copy Markdown

Enable freetype flag for windows and set the necessary compiler flags. Fixes #547 Canvas.Font on Windows.

While this "works on my machine", I'd recommend another couple people test it out prior to merging this.

@LinusU

LinusU commented Jul 29, 2015

Copy link
Copy Markdown
Collaborator

@ldhertert The build was failing for an unrelated issue which I have since fixed, could you please rebase on master and push again. This should trigger a new build 👍

@ldhertert

Copy link
Copy Markdown
Author

@LinusU I'm assuming you'll be notified, but the build is now passing.

@LinusU

LinusU commented Jul 29, 2015

Copy link
Copy Markdown
Collaborator

Ehh, I think something strange happened with your pull request. It seems like it's including some of the later commits that is already in. Your branch is now 11 commits ahead and 15 commits behind Automattic:master.

Could you try rebasing by following roughly the following commands. Thank you.

git remote add upstream https://github.com/Automattic/node-canvas.git
git fetch upstream
git rebase upstream/master
git push --force

@deadbeef84

Copy link
Copy Markdown
Contributor

I'm also interested in getting this merged, or alternatively #620. I have tried the changes from this patch, however I had some issues with a missing <unistd.h> being included from fontconfig. It seems this was addressed in #620 by introducing a dummy file, and it seems the library itself has a similar solution. Another solution would be to update the wiki, instructing the user to remove #include <unistd.h> from the fontconfig library. Let me know what you think and I can submit a new pull request with the appropriate changes.

@LinusU

LinusU commented Feb 7, 2016

Copy link
Copy Markdown
Collaborator

@zbjornson Since you are running Windows, would you mind testing this? Thanks!

@zbjornson

Copy link
Copy Markdown
Collaborator

No prob. As @deadbeef84 said, <unistd.h> is absent on Windows. cherry-picking 3p3r@6a47205 from #620 fixed it, then all tests pass. Although, I don't see many tests around font stuff. @ldhertert did you get this to work another way?

@LinusU

LinusU commented May 3, 2017

Copy link
Copy Markdown
Collaborator

#715 has been merged so I don't think that this is relevant no more? Please correct me if I'm wrong :)

@LinusU LinusU closed this May 3, 2017
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.

4 participants