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

[tesseract] Update and fix feature training-tools build #29225

Merged
merged 2 commits into from
Feb 3, 2023

Conversation

autoantwort
Copy link
Contributor

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

github-actions[bot]
github-actions bot previously approved these changes Jan 28, 2023
@LilyWangLL LilyWangLL self-assigned this Jan 28, 2023
@LilyWangLL LilyWangLL added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist category:port-update The issue is with a library, which is requesting update new revision labels Jan 28, 2023
github-actions[bot]
github-actions bot previously approved these changes Jan 29, 2023
Copy link
Contributor

@dg0yt dg0yt left a comment

Choose a reason for hiding this comment

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

When updating vcpkg.json, please add "default_features": false to more complex dependencies (curl, libarchive, ...).

Comment on lines -23 to -25
"cpu-independed": {
"description": "build on any cpu extension commands support"
},
Copy link
Contributor

Choose a reason for hiding this comment

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

If the feature is removed instead of turning it into a no-op, vcpkg upgrade will break if the features is already installed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

I think it could be an extra option, so that features aren't uninstalled without notice.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We could emit a warning

target_link_libraries(unicharset_training
PUBLIC common_training org.sw.demo.unicode.icu.i18n)
else()
- if(${CMAKE_VERSION} VERSION_LESS "3.12.0")
Copy link
Contributor

Choose a reason for hiding this comment

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

if(1)?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I simply used the upstream merged patch

target_include_directories(pango_training BEFORE
PUBLIC ${PANGO_INCLUDE_DIRS})
target_compile_definitions(pango_training PUBLIC -DPANGO_ENABLE_ENGINE)
- if(${CMAKE_VERSION} VERSION_LESS "3.12.0")
Copy link
Contributor

Choose a reason for hiding this comment

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

if(1)?

github-actions[bot]
github-actions bot previously approved these changes Jan 29, 2023
github-actions[bot]
github-actions bot previously approved these changes Jan 29, 2023
@autoantwort
Copy link
Contributor Author

autoantwort commented Jan 30, 2023

When updating vcpkg.json, please add "default_features": false to more complex dependencies (curl, libarchive, ...).

Still hate that this is not the default ...

github-actions[bot]
github-actions bot previously approved these changes Jan 30, 2023
@autoantwort
Copy link
Contributor Author

Depends on #29266

@LilyWangLL LilyWangLL added the depends:different-pr This PR or Issue depends on a PR which has been filed label Jan 31, 2023
@LilyWangLL LilyWangLL removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Feb 2, 2023
@LilyWangLL LilyWangLL added the info:reviewed Pull Request changes follow basic guidelines label Feb 3, 2023
@BillyONeal BillyONeal merged commit ba588a0 into microsoft:master Feb 3, 2023
@BillyONeal
Copy link
Member

Thanks for the update and feature fix!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants