From 12640ddf03a5ccd2fda488dc23a4e8144ba4e4df Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 24 Aug 2023 13:32:05 +0800 Subject: [PATCH] [mecab] Include functional to fix error C2039 and C2504 (#33334) * fix error C2039 and C2504 * update supports * update * update --- ports/mecab/fix-missing-functional.patch | 12 ++++++++++++ ports/mecab/portfile.cmake | 3 ++- ports/mecab/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/m-/mecab.json | 5 +++++ 5 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 ports/mecab/fix-missing-functional.patch diff --git a/ports/mecab/fix-missing-functional.patch b/ports/mecab/fix-missing-functional.patch new file mode 100644 index 0000000000..773429ccc6 --- /dev/null +++ b/ports/mecab/fix-missing-functional.patch @@ -0,0 +1,12 @@ +diff --git a/mecab/src/dictionary.h b/mecab/src/dictionary.h +index 7046023..32ad358 100644 +--- a/mecab/src/dictionary.h ++++ b/mecab/src/dictionary.h +@@ -10,6 +10,7 @@ + #include "mmap.h" + #include "darts.h" + #include "char_property.h" ++#include + + namespace MeCab { + diff --git a/ports/mecab/portfile.cmake b/ports/mecab/portfile.cmake index 62db155caf..b288e2ab3c 100644 --- a/ports/mecab/portfile.cmake +++ b/ports/mecab/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_wpath_unsigned.patch + fix-missing-functional.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/mecab/src") @@ -25,4 +26,4 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/mecab/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/mecab/COPYING") diff --git a/ports/mecab/vcpkg.json b/ports/mecab/vcpkg.json index 7a3c57dc3a..b59d7130ec 100644 --- a/ports/mecab/vcpkg.json +++ b/ports/mecab/vcpkg.json @@ -1,9 +1,9 @@ { "name": "mecab", "version-date": "2019-09-25", - "port-version": 4, + "port-version": 5, "description": "A morphological analysis engine based on CRF", - "supports": "!(uwp | arm | arm64)", + "supports": "!uwp & !(arm & windows)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 6473e95aba..6d2ddeeefc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5294,7 +5294,7 @@ }, "mecab": { "baseline": "2019-09-25", - "port-version": 4 + "port-version": 5 }, "memorymodule": { "baseline": "2019-12-31", diff --git a/versions/m-/mecab.json b/versions/m-/mecab.json index 6ab5b38ea3..8c33858cbe 100644 --- a/versions/m-/mecab.json +++ b/versions/m-/mecab.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66081fbeecacd152e3964b0f64f25e0f0b10d461", + "version-date": "2019-09-25", + "port-version": 5 + }, { "git-tree": "d5f64d85fddc71ff872f675cda3ed8ee767193f1", "version-date": "2019-09-25",