Skip to content

[cairo] Fix Windows build#23995

Closed
Thomas1664 wants to merge 5 commits intomicrosoft:masterfrom
Thomas1664:cairo
Closed

[cairo] Fix Windows build#23995
Thomas1664 wants to merge 5 commits intomicrosoft:masterfrom
Thomas1664:cairo

Conversation

@Thomas1664
Copy link
Copy Markdown
Contributor

@Thomas1664 Thomas1664 commented Apr 5, 2022

Describe the pull request

  • What does your PR fix?

    Fixes Windows CI issues

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    unchanged

  • Does your PR follow the maintainer guide?

    Yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    I am still working on this PR

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

Neumann-A
Neumann-A reviewed Apr 5, 2022
View reviewed changes
@JonLiu1993 JonLiu1993 self-assigned this Apr 6, 2022
@JonLiu1993 JonLiu1993 added the category:port-bug The issue is with a library, which is something the port should already support label Apr 6, 2022
JackBoosY
JackBoosY reviewed Apr 6, 2022
View reviewed changes
ports/cairo/dwrite-header.patch
*/

-#if HAVE_DWRITE_3_H
+#if 1
Copy link
Copy Markdown
Contributor

@JackBoosY JackBoosY Apr 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should figure out why HAVE_DWRITE_3_H wasn't defined to 1 instead of forcing it to 1 here since we have non-Windows triplets.

@JackBoosY
Copy link
Copy Markdown
Contributor

JackBoosY commented Apr 6, 2022

According to the pipeline configure log:

...
Library dwrite found: YES
...
Has header "dwrite.h" : YES 
Has header "dwrite_3.h" : YES 
...
Has header "dwrite_3.h" : YES (cached)
...
    Win32 DWrite            : YES

HAVE_DWRITE_3_H should be configured to 1.

@JackBoosY
Copy link
Copy Markdown
Contributor

JackBoosY commented Apr 6, 2022

This is not related to dwriter but related to port libatomic-ops. cairo will find this port then consider how to compiles.

@JackBoosY JackBoosY mentioned this pull request Apr 6, 2022
Merged
@JackBoosY
Copy link
Copy Markdown
Contributor

JackBoosY commented Apr 6, 2022

Close this PR in favor of #23999, sorry.

@JackBoosY JackBoosY closed this Apr 6, 2022
@Thomas1664 Thomas1664 deleted the cairo branch December 29, 2022 00:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@github-actions github-actions[bot] github-actions[bot] approved these changes

+2 more reviewers

@Neumann-A Neumann-A Neumann-A left review comments

@JackBoosY JackBoosY JackBoosY left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@JackBoosY JackBoosY

@JonLiu1993 JonLiu1993

Labels

category:port-bug The issue is with a library, which is something the port should already support invalid

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Thomas1664 @JackBoosY @Neumann-A @JonLiu1993