freetype: fix build #8170
Closed
freetype: fix build #8170
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Summary of ChangesHello @choyy, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request addresses and resolves build failures for the Highlights
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request fixes the freetype build by updating the dependency handling. It introduces a patch for Brotli to correctly link the brotlicommon library and simplifies the build script by removing now-redundant logic for manually passing dependency paths to CMake. The changes are logical and improve the maintainability of the package definition. I have one suggestion to improve the readability of the new Brotli patch.
|
|
||
| on_install(function (package) | ||
| io.replace("CMakeLists.txt", "cmake_minimum_required(VERSION 3.12", "cmake_minimum_required(VERSION 3.25", {plain = true}) | ||
| io.replace("builds/cmake/FindBrotliDec.cmake", "${PC_BROTLIDEC_LIBRARY_DIRS})", "${PC_BROTLIDEC_LIBRARY_DIRS})\nfind_library(BROTLICOMMON_LIB NAMES brotlicommon HINTS ${PC_BROTLIDEC_LIBDIR})\nlist(APPEND BROTLIDEC_LIBRARIES ${BROTLICOMMON_LIB})", {plain = true}) |
There was a problem hiding this comment.
The replacement string in this io.replace call is quite long and contains embedded newline characters (\n), which harms readability and makes future maintenance more difficult. To improve this, consider defining the replacement string in a more readable way, for example by using table.concat or a multi-line string. This would make the CMake code being injected much clearer.
For example:
local replacement = table.concat({
"${PC_BROTLIDEC_LIBRARY_DIRS})",
"find_library(BROTLICOMMON_LIB NAMES brotlicommon HINTS ${PC_BROTLIDEC_LIBDIR})",
"list(APPEND BROTLIDEC_LIBRARIES ${BROTLICOMMON_LIB})"
}, "\n")
io.replace("builds/cmake/FindBrotliDec.cmake", "${PC_BROTLIDEC_LIBRARY_DIRS})", replacement, {plain = true})
|
I'm not sure to understand how this is better than the previous solution? |
|
I think that |
|
I don't get why we remove all hint except for brotli, which was working before. |
|
Libfiles contain dll, see #8155 |
brotli is ported to xmake, cmake can't find it if removing FindDependency.cmake. |
Then we just need to filter .dll out of them |
|
how about this: #8182 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.