-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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: Remove patch for freetype libtool version number #23010
fontconfig: Remove patch for freetype libtool version number #23010
Conversation
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
I detected other pull requests that are modifying fontconfig/meson recipe:
This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there. |
I detected other pull requests that are modifying fontconfig/all recipe: This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there. |
This comment has been minimized.
This comment has been minimized.
This patch is a bad workaround for improper versioning in the freetype package. This is fixed in the freetype package itself in conan-io#22974.
This fixes the following error, which can be seen when running the test package: ``` Fontconfig error: Cannot load default config file: No such file: (null) ``` This is fixed by installing the fontconfig configuration file. It was being installed to the wrong location in the Meson package previously. Additionally, don't set `FONTCONFIG_FILE`, but instead append to `FONTCONFIG_PATH` only. This works and makes it easier for consumers to opt for the system font directory. See conan-io#5782.
0e3abda
to
4c0fa5a
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this PR seems to be urgent. LGTM
The build is now finished. You can take a look at the results here |
thanks for helping out @ericLemanissier |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
I told the team yesterday to merge this immediately after the freetype one. I'll update it to at least get it building. |
Out of curiosity, did you guys ever experimented with GitHub merge queue's? It's on my bucket list to investigate the usefulness for our project. It seems to be helpful for these kind of stacked PR's |
This comment has been minimized.
This comment has been minimized.
Hooks produced the following warnings for commit ed6f874fontconfig/2.14.2@#4dea4eddccccabdaf8a666f69b3f2205
|
Conan v1 pipeline ✔️All green in build 9 (
Conan v2 pipeline ✔️
All green in build 9 ( |
The build is now finished. You can take a look at the results here |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Thanks everyone on behalf of team Cura for giving this PR priority. It's appreciated ❤️ ! |
|
||
import os | ||
|
||
required_conan_version = ">=1.53.0" | ||
required_conan_version = ">=1.64.0 <2 || >=2.2.0" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jwillikers Why was this massive bump to the required Conan version necessary?
Related to conan-io/conan#16140
This patch is a bad workaround for improper versioning in the freetype package. This is fixed in the freetype package itself in #22974.
In addition, this fixes the following error, which can be seen when running the test package for the Meson variant of the package:
This is fixed by installing the fontconfig configuration file.
It was being installed to the wrong location in the Meson package previously.
Additionally, don't set
FONTCONFIG_FILE
, but instead append toFONTCONFIG_PATH
only.This works and makes it easier for consumers to opt for the system font directory.
See #5782.
Requires: