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 to 5.2.0 #26114

Merged
merged 17 commits into from
Aug 15, 2022

Conversation

LilyWangLL
Copy link
Contributor

Describe the pull request

@LilyWangLL LilyWangLL added info:internal This PR or Issue was filed by the vcpkg team. category:port-update The issue is with a library, which is requesting update new revision labels Aug 2, 2022
github-actions[bot]
github-actions bot previously approved these changes Aug 2, 2022
@jasonodomtaqtile
Copy link

I am trying to build a version of Tesseract to work with HoloLens 2 arm-uwp(hoping this will work) @LilyWangLL any chance of fixing these check errors?

@LilyWangLL
Copy link
Contributor Author

I am trying to build a version of Tesseract to work with HoloLens 2 arm-uwp(hoping this will work) @LilyWangLL any chance of fixing these check errors?

I will try.

github-actions[bot]
github-actions bot previously approved these changes Aug 10, 2022
…LilyWang/issue16019

# Conflicts:
#	ports/opencv4/vcpkg.json
#	versions/baseline.json
#	versions/o-/opencv4.json
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 1370b2c88f1e683c5c6a2465133eaa9a9b3ee679 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 89163fa..da8e068 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5202,7 +5202,7 @@
     },
     "opencv4": {
       "baseline": "4.6.0",
-      "port-version": 0
+      "port-version": 1
     },
     "opendnp3": {
       "baseline": "3.1.1",
diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
index ee86692..02a4860 100644
--- a/versions/o-/opencv4.json
+++ b/versions/o-/opencv4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7e68cc391f73ab4e09d22ebd4f35f62e58acc23e",
+      "version": "4.6.0",
+      "port-version": 1
+    },
     {
       "git-tree": "1ff543272c91a32d242ad5320e9ca63b29b34ed2",
       "version": "4.6.0",

github-actions[bot]
github-actions bot previously approved these changes Aug 11, 2022
@LilyWangLL
Copy link
Contributor Author

@jasonodomtaqtile tesseract depends on libarchive and leptonica, and they all don't support uwp, so tesseract can't install on uwp.

github-actions[bot]
github-actions bot previously approved these changes Aug 12, 2022
github-actions[bot]
github-actions bot previously approved these changes Aug 12, 2022
github-actions[bot]
github-actions bot previously approved these changes Aug 12, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for tesseract have changed but the version was not updated
version: 5.2.0
old SHA: 4295c14c2cba326f07271c7fdf12c326fecbcd38
new SHA: 5ea8fcd243e8aa38e1a83eaa1c745fc53a3464cc
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

@LilyWangLL LilyWangLL marked this pull request as ready for review August 15, 2022 06:05
@LilyWangLL LilyWangLL requested a review from JackBoosY August 15, 2022 06:05
@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Aug 15, 2022
@JavierMatosD
Copy link
Contributor

Thank You!

@JavierMatosD JavierMatosD merged commit 69e4d02 into microsoft:master Aug 15, 2022
@LilyWangLL LilyWangLL deleted the dev/LilyWang/issue16019 branch August 16, 2022 06:40
@cenit
Copy link
Contributor

cenit commented Aug 16, 2022

This PR broke opencv3 and highlights the importance of restoring the port in the CI tests...

@cenit
Copy link
Contributor

cenit commented Aug 16, 2022

It should be a mantra: every patch to opencv4 almost surely has an equivalent for opencv3 and maybe even for opencv2...

@cenit
Copy link
Contributor

cenit commented Aug 16, 2022

this update also broke normal tesseract downstream usage, or at least highlighted a non-tracked CURL dependency which breaks cache sharing between projects

@cenit
Copy link
Contributor

cenit commented Aug 16, 2022

I will open a PR asap trying to fix both errors

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[tesseract] update to 5.x.x
5 participants