[tesseract] Fix static linking. [icu][tiff] Add patches in toolchain to fix static linking.

ports/tesseract/CONTROL

@@ -1,4 +1,4 @@
 Source: tesseract
-Version: 3.05.01-1
+Version: 3.05.01-2
 Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.
 Build-Depends: leptonica, icu

ports/tesseract/portfile.cmake

@@ -19,6 +19,9 @@ vcpkg_apply_patches(
         ${CMAKE_CURRENT_LIST_DIR}/use-vcpkg-icu.patch
 )
 
+# The built-in cmake FindICU is better
+file(REMOVE ${SOURCE_PATH}/cmake/FindICU.cmake)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA

scripts/buildsystems/vcpkg.cmake

@@ -157,10 +157,20 @@ macro(find_package name)
         unset(Boost_USE_STATIC_LIBS)
         unset(Boost_USE_MULTITHREADED)
         unset(Boost_USE_STATIC_RUNTIME)
-    endif()
-    _find_package(${ARGV})
-
-    if("${name}" STREQUAL "TIFF")
+        _find_package(${ARGV})
+    elseif("${name}" STREQUAL "ICU")
+        function(_vcpkg_find_in_list)
+            list(FIND ARGV "COMPONENTS" COMPONENTS_IDX)
+            set(COMPONENTS_IDX ${COMPONENTS_IDX} PARENT_SCOPE)
+        endfunction()
+        _vcpkg_find_in_list(${ARGV})
+        if(NOT COMPONENTS_IDX EQUAL -1)
+            _find_package(${ARGV} COMPONENTS data)
+        else()
+            _find_package(${ARGV})
+        endif()
+    elseif("${name}" STREQUAL "TIFF")
+        _find_package(${ARGV})
         find_package(LibLZMA)
         if(TARGET TIFF::TIFF)
             set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${LIBLZMA_LIBRARIES})
@@ -168,6 +178,8 @@ macro(find_package name)
         if(TIFF_LIBRARIES)
             list(APPEND TIFF_LIBRARIES ${LIBLZMA_LIBRARIES})
         endif()
+    else()
+        _find_package(${ARGV})
     endif()
 endmacro()