From 4acf5735545795c3b00898df7183219d5dfda62b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Wed, 12 Feb 2020 08:27:17 +0800
Subject: [PATCH] [oniguruma] Update to 6.9.4 (#10019)

---
 ports/oniguruma/CONTROL        |  2 +-
 ports/oniguruma/fix-uwp.patch  | 26 ++++++++++++++++++++++++++
 ports/oniguruma/portfile.cmake | 12 ++++--------
 3 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 ports/oniguruma/fix-uwp.patch

diff --git a/ports/oniguruma/CONTROL b/ports/oniguruma/CONTROL
index 087fb428b..8ca0146fe 100644
--- a/ports/oniguruma/CONTROL
+++ b/ports/oniguruma/CONTROL
@@ -1,5 +1,5 @@
 Source: oniguruma
-Version: 6.9.3
+Version: 6.9.4
 Description: Modern and flexible regular expressions library
 Homepage: https://github.com/kkos/oniguruma
 
diff --git a/ports/oniguruma/fix-uwp.patch b/ports/oniguruma/fix-uwp.patch
new file mode 100644
index 000000000..5f3fb51e9
--- /dev/null
+++ b/ports/oniguruma/fix-uwp.patch
@@ -0,0 +1,26 @@
+diff --git a/src/regcomp.c b/src/regcomp.c
+index 69d4b95..380f441 100644
+--- a/src/regcomp.c
++++ b/src/regcomp.c
+@@ -3880,7 +3880,7 @@ reduce_string_list(Node* node)
+     {
+       Node* prev;
+       Node* curr;
+-      Node* prev_node;
++      Node* prev_node = NULL;
+       Node* next_node;
+ 
+       prev = NULL_NODE;
+diff --git a/src/regexec.c b/src/regexec.c
+index ce498c6..6848c0f 100644
+--- a/src/regexec.c
++++ b/src/regexec.c
+@@ -4216,7 +4216,7 @@ regset_search_body_position_lead(OnigRegSet* set,
+ {
+   int r, n, i;
+   UChar *s, *prev;
+-  UChar *low, *high, *low_prev;
++  UChar *low, *high, *low_prev = NULL;
+   UChar* sch_range;
+   regex_t* reg;
+   OnigEncoding enc;
diff --git a/ports/oniguruma/portfile.cmake b/ports/oniguruma/portfile.cmake
index 7a4451f14..aa19762cb 100644
--- a/ports/oniguruma/portfile.cmake
+++ b/ports/oniguruma/portfile.cmake
@@ -1,11 +1,10 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kkos/oniguruma
-    REF v6.9.3
-    SHA512 a0f4da26ba08de516c05b5e4b803a9cf8013489c3743ecf27fbc3f66f835eef8fca81b9ed2bd68729a470fe897994046843a4fd31d44a9584ff8dabd1748df21
+    REF e03900b038a274ee2f1341039e9003875c11e47d # v6.9.4
+    SHA512 77772e3994acbdde86a7405d24423fff101061e24cc8cd85975d3ab092935fc91c0c3b991fe2fa9e9a857b5254db7d923256cdb29a2e2d8a3cdd41837ed690f6
     HEAD_REF master
+    PATCHES fix-uwp.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -45,7 +44,4 @@ else()
 endif()
 
 # Handle copyright
-configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)