[uchardet] Update to 2021-09-03 (#19980)

* [uchardet] Update to 2021-09-03

* [uchardet] Bump version

* [uchardet] Fix UWP build

* [uchardet] Overwrite version

* [uchardet] Add version

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

5 files changed, 44 insertions, 34 deletions

diff --git a/ports/uchardet/fix-uwp-build.patch b/ports/uchardet/fix-uwp-build.patch
new file mode 100644
index 000000000..d08ba9e79
--- /dev/null
+++ b/ports/uchardet/fix-uwp-build.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 50a11e8..3a93c83 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,6 +54,10 @@ if (TARGET_ARCHITECTURE MATCHES ".*(x86|amd|i686).*")
+     endif (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
+ endif (TARGET_ARCHITECTURE MATCHES ".*(x86|amd|i686).*")
+ 
++if (MSVC)
++    add_compile_options(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
++endif (MSVC)
++
+ configure_file(
+ 	uchardet.pc.in
+ 	uchardet.pc
diff --git a/ports/uchardet/portfile.cmake b/ports/uchardet/portfile.cmake
index 281dec77d..a407fd783 100644
--- a/ports/uchardet/portfile.cmake
+++ b/ports/uchardet/portfile.cmake
@@ -1,25 +1,21 @@
 vcpkg_from_git(

     OUT_SOURCE_PATH SOURCE_PATH

     URL https://gitlab.freedesktop.org/uchardet/uchardet

-    REF 8681fc060ea07f646434cd2d324e4a5aa7c495c4

+    REF 6f38ab95f55afd45ee6ccefcb92d21034b4a2521

+    PATCHES

+        fix-uwp-build.patch

 )

 

 vcpkg_check_features(

     OUT_FEATURE_OPTIONS FEATURE_OPTIONS

-    tool BUILD_BINARY

+    FEATURES

+        tool BUILD_BINARY

 )

 

 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)

 

-if(VCPKG_TARGET_IS_UWP)

-    # uchardet calls `fopen` and `strdup`, which makes UWP unhappy.

-    set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE")

-    set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE")

-endif()

-

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

+vcpkg_cmake_configure(

+    SOURCE_PATH "${SOURCE_PATH}"

     OPTIONS_DEBUG

         -DBUILD_BINARY=OFF

     OPTIONS_RELEASE

@@ -28,29 +24,18 @@ vcpkg_configure_cmake(
         -DBUILD_STATIC=${BUILD_STATIC}

 )

 

-vcpkg_install_cmake()

+vcpkg_cmake_install()

 

 vcpkg_copy_pdbs()

 

 if(tool IN_LIST FEATURES)

-    file(COPY

-        ${CURRENT_PACKAGES_DIR}/bin/uchardet${VCPKG_TARGET_EXECUTABLE_SUFFIX}

-        DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}

-    )

-

-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})

-endif()

-

-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)

-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)

-else()

-    file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/uchardet${VCPKG_TARGET_EXECUTABLE_SUFFIX})

+    vcpkg_copy_tools(TOOL_NAMES uchardet AUTO_CLEAN)

 endif()

 

 file(REMOVE_RECURSE

-    ${CURRENT_PACKAGES_DIR}/debug/include

-    ${CURRENT_PACKAGES_DIR}/debug/share

-    ${CURRENT_PACKAGES_DIR}/share/man

+    "${CURRENT_PACKAGES_DIR}/debug/include"

+    "${CURRENT_PACKAGES_DIR}/debug/share"

+    "${CURRENT_PACKAGES_DIR}/share/man"

 )

 

-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/ports/uchardet/vcpkg.json b/ports/uchardet/vcpkg.json
index c7b7cad8d..41a2bbe78 100644
--- a/ports/uchardet/vcpkg.json
+++ b/ports/uchardet/vcpkg.json
@@ -1,12 +1,17 @@
 {
   "name": "uchardet",
-  "version-string": "2020-04-26",
-  "port-version": 1,
-  "description": "An encoding detector library ported from Mozilla",
+  "version-date": "2021-09-03",
+  "description": "An encoding detector library ported from Mozilla.",
   "homepage": "https://cgit.freedesktop.org/uchardet/uchardet/",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ],
   "features": {
     "tool": {
-      "description": "Build uchardet CLI tool",
+      "description": "Build uchardet CLI tool.",
       "dependencies": [
         "getopt"
       ]
diff --git a/versions/baseline.json b/versions/baseline.json
index 120d92335..deb8ee639 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6569,8 +6569,8 @@
       "port-version": 0
     },
     "uchardet": {
-      "baseline": "2020-04-26",
-      "port-version": 1
+      "baseline": "2021-09-03",
+      "port-version": 0
     },
     "umock-c": {
       "baseline": "2020-06-17",
diff --git a/versions/u-/uchardet.json b/versions/u-/uchardet.json
index e773544ad..11892e0a2 100644
--- a/versions/u-/uchardet.json
+++ b/versions/u-/uchardet.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "46d56e5d20654b04eb3b97cc2ae46b1ae7c07eb9",
+      "version-date": "2021-09-03",
+      "port-version": 0
+    },
+    {
       "git-tree": "074fd1696e7c47ef9dce162bfad50572a8d766f1",
       "version-string": "2020-04-26",
       "port-version": 1