[tinyutf8] Updating to v4.0.2 (#13706)

Update DuffsDevice/tinyutf8 library from v3.0.1 to v4.0.2
microsoft · Sep 24, 2020 · de09af8 · de09af8
1 parent 5d33bd3
commit de09af8
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 32 deletions.
diff --git a/ports/tinyutf8/CONTROL b/ports/tinyutf8/CONTROL
@@ -1,3 +1,3 @@
 Source: tinyutf8
-Version: 3.0.1
+Version: 4.0.2
 Description: TINYUTF8 is a library for extremely easy integration of Unicode into an arbitrary C++11 project.
diff --git a/ports/tinyutf8/fixbuild.patch b/ports/tinyutf8/fixbuild.patch
@@ -1,29 +1,43 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4ec8787..cfea5b3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required(VERSION 3.1)
- project(tinyutf8)
-
--set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD 17)
-
- option(TINYUTF8_BUILD_STATIC "Build as static library" On)
-
-@@ -14,3 +14,14 @@ endif()
- add_library(tinyutf8 ${LIB_BUILD_TYPE} lib/tinyutf8.cpp)
-
- target_include_directories(tinyutf8 PUBLIC include)
-+
-+if(MSVC)
-+    ADD_DEFINITIONS(-D_UNICODE)
-+endif()
-+
-+install(TARGETS tinyutf8
-+    RUNTIME DESTINATION bin
-+    ARCHIVE DESTINATION lib
-+    LIBRARY DESTINATION lib)
-+
-+install(FILES include/tinyutf8.h DESTINATION include)
-\ No newline at end of file
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eef0c41..5d2c0d1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 3.1)
+ project(tinyutf8)
+
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 17)
+
+ option(TINYUTF8_BUILD_STATIC "Build as static library" On)
+
+@@ -12,3 +12,14 @@ else()
+ endif()
+
+ add_library(tinyutf8 ${LIB_BUILD_TYPE} tinyutf8.cpp)
++
++if(MSVC)
++    ADD_DEFINITIONS(-D_UNICODE)
++endif()
++
++install(TARGETS tinyutf8
++    RUNTIME DESTINATION bin
++    ARCHIVE DESTINATION lib
++    LIBRARY DESTINATION lib)
++
++install(FILES tinyutf8.h DESTINATION include)
+diff --git a/tinyutf8.cpp b/tinyutf8.cpp
+index ca07b1e..502312f 100644
+--- a/tinyutf8.cpp
++++ b/tinyutf8.cpp
+@@ -1,6 +1,6 @@
+ #include "tinyutf8.h"
+
+ // Explicit template instantiations for utf8_string
+-template struct tiny_utf8::basic_utf8_string<>;
+-template extern std::ostream& operator<<( std::ostream& stream , const tiny_utf8::basic_utf8_string<>& str );
+-template extern std::istream& operator>>( std::istream& stream , tiny_utf8::basic_utf8_string<>& str );
+\ No newline at end of file
++template class tiny_utf8::basic_utf8_string<>;
++extern template std::ostream& operator<<( std::ostream& stream , const tiny_utf8::basic_utf8_string<>& str );
++extern template std::istream& operator>>( std::istream& stream , tiny_utf8::basic_utf8_string<>& str );
diff --git a/ports/tinyutf8/portfile.cmake b/ports/tinyutf8/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DuffsDevice/tinyutf8
-    REF 8dc06049d8bc4455145eaf647ce7a4733ba26557
-    SHA512 00a11febc36f7bc7c6af60c7d43e558ea145ec9f3ef85cfe4bc53ef4d51e233e85c15159825aa684b5a003f04c48d3453256ebb572e810a75206e79c5c87f2d6
+    REF 68eaf247a3761c324b1a3806a954d773dfe9106b
+    SHA512 e8bd51ea66a84d236be7c2028b6f3a67b5b01f0fac758729f3152542c8a6a859ddb3f72d6c5abb058c909bf84862ed816e2235cfde6bfa7edaa8026a4f7f4b2a
     HEAD_REF master
     PATCHES fixbuild.patch
 )