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

[fontconfig] Fix FC_TEMPLATEDIR #34430

Merged
merged 1 commit into from
Oct 13, 2023
Merged

Conversation

Osyotr
Copy link
Contributor

@Osyotr Osyotr commented Oct 11, 2023

@Cheney-W Cheney-W added the category:port-bug The issue is with a library, which is something the port should already support label Oct 12, 2023
@Cheney-W Cheney-W added the info:reviewed Pull Request changes follow basic guidelines label Oct 12, 2023
@BillyONeal
Copy link
Member

Follow-up to #28236

I'm not sure I understand. That PR is intentionally damaging FC_TEMPLATEDIR to ensure one from the system isn't accidentally used. This PR appears to be intentionally trying to use one from the system?

Copy link
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

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

(Just looking for an explanation, the change is likely OK!)

@Osyotr
Copy link
Contributor Author

Osyotr commented Oct 13, 2023

That PR is intentionally damaging FC_TEMPLATEDIR to ensure one from the system isn't accidentally used.

Yes but only on windows. On unix #28236 replaces ${CURRENT_PACKAGES_DIR} with nothing, so ${CURRENT_PACKAGES_DIR}/etc becomes /etc and so on. This is what chromium does.
This PR replaces /share with /usr/share because the former path is incorrect and doesn't exist.

Copy link
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

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

I strongly suspect this is wrong but it isn't more wrong than what was already here.

@BillyONeal BillyONeal merged commit 582472e into microsoft:master Oct 13, 2023
15 checks passed
@BillyONeal
Copy link
Member

Thanks :)

@Osyotr Osyotr deleted the fontconfig-dirs branch October 13, 2023 18:05
clementperon pushed a commit to clementperon/vcpkg that referenced this pull request Oct 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants