From b00705d70fdf0a9363c241051ae2f1e139e00ee5 Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Mon, 1 Aug 2022 23:16:03 -0700 Subject: [PATCH 01/15] [tesseract] update to 5.2.0 --- ports/tesseract/fix-tiff-linkage.patch | 13 ------------- ports/tesseract/fix-timeval.patch | 14 -------------- ports/tesseract/portfile.cmake | 17 ++++++++--------- ports/tesseract/vcpkg.json | 4 ++-- 4 files changed, 10 insertions(+), 38 deletions(-) delete mode 100644 ports/tesseract/fix-tiff-linkage.patch delete mode 100644 ports/tesseract/fix-timeval.patch diff --git a/ports/tesseract/fix-tiff-linkage.patch b/ports/tesseract/fix-tiff-linkage.patch deleted file mode 100644 index f4720c02270dbf..00000000000000 --- a/ports/tesseract/fix-tiff-linkage.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f154663..c07b827 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -431,7 +431,7 @@ endif() - add_executable (tesseract ${tesseractmain_src} ${tesseractmain_rsc}) - target_link_libraries (tesseract libtesseract) - if (HAVE_TIFFIO_H) -- target_link_libraries(tesseract tiff) -+ target_link_libraries(tesseract TIFF::TIFF) - endif() - - if (OPENMP_BUILD AND UNIX) diff --git a/ports/tesseract/fix-timeval.patch b/ports/tesseract/fix-timeval.patch deleted file mode 100644 index 5a3274830d1fa7..00000000000000 --- a/ports/tesseract/fix-timeval.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/ccutil/ocrclass.h b/src/ccutil/ocrclass.h -index d39a6dd..3755632 100644 ---- a/src/ccutil/ocrclass.h -+++ b/src/ccutil/ocrclass.h -@@ -28,6 +28,9 @@ - - #include - #include -+#ifndef _WIN32 -+#include -+#endif - #ifdef _WIN32 - #include // for timeval - #endif diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index 6978f5625d0797..83d9143e738bff 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -1,11 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tesseract-ocr/tesseract - REF 4.1.1 - SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2 - PATCHES - fix-tiff-linkage.patch - fix-timeval.patch # Remove this patch in the next update + REF 5ad5325a0aa8effc47ca033625b6a51682f82767 #v5.2.0 + SHA512 c6ed442c9deb28772aeb918142dab08d5b55eeeeccb0c1d3f13cf51bb72af227afb7f14c19a5c8db40d6a7b8cfeccb3af08a78adfcd7431e4a06f65372709ceb ) # The built-in cmake FindICU is better @@ -34,18 +31,19 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_OpenCL=ON -DLeptonica_DIR=YES -DTARGET_ARCHITECTURE=${TARGET_ARCHITECTURE} + -DSW_BUILD=OFF ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tesseract) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake" - "find_package(Leptonica REQUIRED)" + "find_dependency(Leptonica)" [[ -find_package(Leptonica REQUIRED) -find_package(LibArchive REQUIRED) +find_dependency(Leptonica) +find_dependency(LibArchive) ]] ) @@ -68,6 +66,7 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tesseract/vcpkg.json b/ports/tesseract/vcpkg.json index 6b2477d6b462eb..ec8c6d27526110 100644 --- a/ports/tesseract/vcpkg.json +++ b/ports/tesseract/vcpkg.json @@ -1,9 +1,9 @@ { "name": "tesseract", - "version": "4.1.1", - "port-version": 10, + "version": "5.2.0", "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.", "homepage": "https://github.com/tesseract-ocr/tesseract", + "license": "Apache-2.0", "supports": "!arm", "dependencies": [ "leptonica", From 99ec2e4ee3efc85e4aae292905b67d33fd0b03ac Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Mon, 1 Aug 2022 23:16:59 -0700 Subject: [PATCH 02/15] x-add-version --- versions/baseline.json | 4 ++-- versions/t-/tesseract.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 56e3fd4df130b8..78a116f8199fe7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7021,8 +7021,8 @@ "port-version": 0 }, "tesseract": { - "baseline": "4.1.1", - "port-version": 10 + "baseline": "5.2.0", + "port-version": 0 }, "tfhe": { "baseline": "1.0.1", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index e13ddd02565661..ea99e7ad16bedb 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa58775d2c0c4b822d628401689b07487b4352e3", + "version": "5.2.0", + "port-version": 0 + }, { "git-tree": "ac84bef93d2709f28bf4ab8341a80dab949a8cf1", "version": "4.1.1", From b6d219392bf61dbf79ce9f3c026b1a59fc65f769 Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Wed, 10 Aug 2022 00:11:17 -0700 Subject: [PATCH 03/15] fix windows build error --- ports/tesseract/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index 83d9143e738bff..682ad4277c50b6 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -50,7 +50,7 @@ find_dependency(LibArchive) vcpkg_copy_tools(TOOL_NAMES tesseract AUTO_CLEAN) if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tesseract.pc" "-ltesseract41" "-ltesseract41d") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tesseract.pc" "-ltesseract52" "-ltesseract52d") endif() vcpkg_fixup_pkgconfig() From 1ac89fdb94464118cc1564679a0cca362d64bf0e Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Wed, 10 Aug 2022 00:12:02 -0700 Subject: [PATCH 04/15] version --- versions/t-/tesseract.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index ea99e7ad16bedb..7cd26c2099a5d7 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fa58775d2c0c4b822d628401689b07487b4352e3", + "git-tree": "b380f46e67ec39d3304bdc9da6ef7580296d51f6", "version": "5.2.0", "port-version": 0 }, From 481105bca878c188fc07b6972b522b0b0bd1317e Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Thu, 11 Aug 2022 02:52:10 -0700 Subject: [PATCH 05/15] fix opencv4 build error --- ports/opencv4/0017-fix-depend-tesseract.patch | 13 +++++++++++++ ports/opencv4/portfile.cmake | 1 + ports/opencv4/vcpkg.json | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/opencv4/0017-fix-depend-tesseract.patch diff --git a/ports/opencv4/0017-fix-depend-tesseract.patch b/ports/opencv4/0017-fix-depend-tesseract.patch new file mode 100644 index 00000000000000..3f873bc59a64be --- /dev/null +++ b/ports/opencv4/0017-fix-depend-tesseract.patch @@ -0,0 +1,13 @@ +diff --git a/modules/text/cmake/init.cmake b/modules/text/cmake/init.cmake +index 254757e..73194ec 100644 +--- a/modules/text/cmake/init.cmake ++++ b/modules/text/cmake/init.cmake +@@ -4,6 +4,8 @@ OCV_OPTION(WITH_TESSERACT "Include Tesseract OCR library support" (NOT CMAKE_CRO + if(NOT HAVE_TESSERACT + AND (WITH_TESSERACT OR OPENCV_FIND_TESSERACT) + ) ++ find_package(Tesseract CONFIG REQUIRED) ++ set(Tesseract_LIBRARIES Tesseract::libtesseract) + if(NOT Tesseract_FOUND) + find_package(Tesseract QUIET) # Prefer CMake's standard locations (including Tesseract_DIR) + endif() diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index be4e0ecb78b0b4..870a68ffcdd9f5 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -184,6 +184,7 @@ if("contrib" IN_LIST FEATURES) PATCHES 0007-fix-hdf5.patch 0016-fix-freetype-contrib.patch + 0017-fix-depend-tesseract.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 90a10987d54583..92b78c274d8ef5 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.5.5", - "port-version": 7, + "port-version": 8, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", From 03f65ee1ad2aa12e382afe46640f5ac8aea8cb7a Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Thu, 11 Aug 2022 02:53:01 -0700 Subject: [PATCH 06/15] version --- versions/baseline.json | 2 +- versions/o-/opencv4.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 78a116f8199fe7..9e24fcc628ff6b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5190,7 +5190,7 @@ }, "opencv4": { "baseline": "4.5.5", - "port-version": 7 + "port-version": 8 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 3c14a9620c9bba..4b10f3f16f9e95 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5d8a935a78f51ba7295536849d50204973a0791", + "version": "4.5.5", + "port-version": 8 + }, { "git-tree": "8e165720af85f0da853cf0a4ac9eb5cb20804d13", "version": "4.5.5", From a1d8cdde35ad417c7a8b068d6891b36e55c46f8b Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Thu, 11 Aug 2022 02:57:54 -0700 Subject: [PATCH 07/15] conflict --- ports/opencv4/vcpkg.json | 6 +----- versions/baseline.json | 5 ----- versions/o-/opencv4.json | 6 ------ 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index d24789ee98efb3..d42295f1ebd071 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,11 +1,7 @@ { "name": "opencv4", -<<<<<<< HEAD - "version": "4.5.5", - "port-version": 8, -======= "version": "4.6.0", ->>>>>>> 1370b2c88f1e683c5c6a2465133eaa9a9b3ee679 + "port-version": 1, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 38157497588092..89163fa1e0017d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5201,13 +5201,8 @@ "port-version": 0 }, "opencv4": { -<<<<<<< HEAD - "baseline": "4.5.5", - "port-version": 8 -======= "baseline": "4.6.0", "port-version": 0 ->>>>>>> 1370b2c88f1e683c5c6a2465133eaa9a9b3ee679 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 137407cde8268c..ee86692054df6a 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,15 +1,9 @@ { "versions": [ { -<<<<<<< HEAD - "git-tree": "f5d8a935a78f51ba7295536849d50204973a0791", - "version": "4.5.5", - "port-version": 8 -======= "git-tree": "1ff543272c91a32d242ad5320e9ca63b29b34ed2", "version": "4.6.0", "port-version": 0 ->>>>>>> 1370b2c88f1e683c5c6a2465133eaa9a9b3ee679 }, { "git-tree": "8e165720af85f0da853cf0a4ac9eb5cb20804d13", From 47bb178f46139c0f2ff6280938521dfb79675048 Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Thu, 11 Aug 2022 02:58:24 -0700 Subject: [PATCH 08/15] version --- versions/baseline.json | 2 +- versions/o-/opencv4.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 89163fa1e0017d..da8e068dbe1323 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 ee86692054df6a..02a4860be477a9 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", From 007646d2f7d329204cbb2b2edee2dfcc782fb2a1 Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Fri, 12 Aug 2022 00:58:46 -0700 Subject: [PATCH 09/15] fix opencv build error on uwp --- ...nd-tesseract.patch => 0018-fix-depend-tesseract.patch} | 0 ports/opencv4/portfile.cmake | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) rename ports/opencv4/{0017-fix-depend-tesseract.patch => 0018-fix-depend-tesseract.patch} (100%) diff --git a/ports/opencv4/0017-fix-depend-tesseract.patch b/ports/opencv4/0018-fix-depend-tesseract.patch similarity index 100% rename from ports/opencv4/0017-fix-depend-tesseract.patch rename to ports/opencv4/0018-fix-depend-tesseract.patch diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 7a0574472cabe3..67c440c4b2f59b 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -177,7 +177,7 @@ if("contrib" IN_LIST FEATURES) 0013-fix-ceres.patch 0014-fix-ogre.patch 0016-fix-freetype-contrib.patch - 0017-fix-depend-tesseract.patch + 0018-fix-depend-tesseract.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") @@ -353,6 +353,12 @@ if("qt" IN_LIST FEATURES) list(APPEND ADDITIONAL_BUILD_FLAGS "-DCMAKE_AUTOMOC=ON") endif() +if("contrib" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_UWP) + list(APPEND ADDITIONAL_BUILD_FLAGS "-DWITH_TESSERACT=OFF") + endif() +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS From d9e5a79513e0d3ac572cb217449cd46a7e1951e1 Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Fri, 12 Aug 2022 00:59:36 -0700 Subject: [PATCH 10/15] version --- versions/o-/opencv4.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 02a4860be477a9..a96d1fe034f440 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7e68cc391f73ab4e09d22ebd4f35f62e58acc23e", + "git-tree": "a6c9bded8fc4ad22bea6869caecf2881c8da2d41", "version": "4.6.0", "port-version": 1 }, From f4192526d1450dd924f6ab07025b1d8dc15105c1 Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Fri, 12 Aug 2022 02:26:06 -0700 Subject: [PATCH 11/15] fix linux build error --- ports/tesseract/fix-depend-libarchive.patch | 14 ++++++++++++++ ports/tesseract/portfile.cmake | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ports/tesseract/fix-depend-libarchive.patch diff --git a/ports/tesseract/fix-depend-libarchive.patch b/ports/tesseract/fix-depend-libarchive.patch new file mode 100644 index 00000000000000..1b57247126c06c --- /dev/null +++ b/ports/tesseract/fix-depend-libarchive.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bd2649d..f932913 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -792,7 +792,8 @@ if(OpenCL_FOUND) + target_link_libraries(libtesseract PUBLIC OpenCL::OpenCL) + endif() + if(LibArchive_FOUND) +- target_link_libraries(libtesseract PUBLIC ${LibArchive_LIBRARIES}) ++ find_package(LibArchive REQUIRED) ++ target_link_libraries(libtesseract PRIVATE LibArchive::LibArchive) + endif(LibArchive_FOUND) + if(CURL_FOUND) + if(NOT CURL_LIBRARIES) diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index 682ad4277c50b6..9c78198b428668 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -3,6 +3,7 @@ vcpkg_from_github( REPO tesseract-ocr/tesseract REF 5ad5325a0aa8effc47ca033625b6a51682f82767 #v5.2.0 SHA512 c6ed442c9deb28772aeb918142dab08d5b55eeeeccb0c1d3f13cf51bb72af227afb7f14c19a5c8db40d6a7b8cfeccb3af08a78adfcd7431e4a06f65372709ceb + PATCHES fix-depend-libarchive.patch ) # The built-in cmake FindICU is better @@ -27,11 +28,15 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} -DSTATIC=${BUILD_STATIC} -DUSE_SYSTEM_ICU=True - -DCMAKE_DISABLE_FIND_PACKAGE_LibArchive=ON + -DCMAKE_DISABLE_FIND_PACKAGE_LibArchive=OFF -DCMAKE_DISABLE_FIND_PACKAGE_OpenCL=ON -DLeptonica_DIR=YES -DTARGET_ARCHITECTURE=${TARGET_ARCHITECTURE} -DSW_BUILD=OFF + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_OpenCL + STATIC + TARGET_ARCHITECTURE ) vcpkg_cmake_install() From 5494c4ce8f0f5abe0d90596f5fc432211ad95ec5 Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Fri, 12 Aug 2022 02:26:40 -0700 Subject: [PATCH 12/15] version --- versions/t-/tesseract.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 7cd26c2099a5d7..fc5f08c3f270ce 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b380f46e67ec39d3304bdc9da6ef7580296d51f6", + "git-tree": "1c32c4851471f1927eaafafb2767da26f465629e", "version": "5.2.0", "port-version": 0 }, From fb4a25f171fa283fc74d0abc9c942a7ec8958e83 Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Fri, 12 Aug 2022 02:34:48 -0700 Subject: [PATCH 13/15] fix --- ports/tesseract/portfile.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index 9c78198b428668..3764e47ef0233a 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -1,9 +1,13 @@ +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(tesseract_patch fix-depend-libarchive.patch) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tesseract-ocr/tesseract REF 5ad5325a0aa8effc47ca033625b6a51682f82767 #v5.2.0 SHA512 c6ed442c9deb28772aeb918142dab08d5b55eeeeccb0c1d3f13cf51bb72af227afb7f14c19a5c8db40d6a7b8cfeccb3af08a78adfcd7431e4a06f65372709ceb - PATCHES fix-depend-libarchive.patch + PATCHES ${tesseract_patch} ) # The built-in cmake FindICU is better From 66a7f48de09d857c6d874ef473a86b81b91dbed9 Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Fri, 12 Aug 2022 02:35:12 -0700 Subject: [PATCH 14/15] version --- versions/t-/tesseract.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index fc5f08c3f270ce..7996cc91f7d3a8 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1c32c4851471f1927eaafafb2767da26f465629e", + "git-tree": "4295c14c2cba326f07271c7fdf12c326fecbcd38", "version": "5.2.0", "port-version": 0 }, From 1757787319d26e1a518ec58831d2ec99be72ece4 Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Sun, 14 Aug 2022 22:58:47 -0700 Subject: [PATCH 15/15] version --- versions/t-/tesseract.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 75d188193379f7..1d7f6743abefcd 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4295c14c2cba326f07271c7fdf12c326fecbcd38", + "git-tree": "5ea8fcd243e8aa38e1a83eaa1c745fc53a3464cc", "version": "5.2.0", "port-version": 0 },