From 8f9a4f2de9da93e5509a326aaca49aa7b917d0cb Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Tue, 30 Aug 2022 02:33:30 +0800 Subject: [PATCH] [opencc] De-vendor darts (#26581) * Add tclap support * Add darts support --- ports/opencc/fix-dependencies.patch | 9 +++++++-- ports/opencc/portfile.cmake | 1 + ports/opencc/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/o-/opencc.json | 5 +++++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ports/opencc/fix-dependencies.patch b/ports/opencc/fix-dependencies.patch index bbdcf10217f..31e33a2e391 100644 --- a/ports/opencc/fix-dependencies.patch +++ b/ports/opencc/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 11d14e4..8180f21 100644 +index 11d14e4..0fa3e1e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -137,6 +137,16 @@ set_target_properties( +@@ -137,6 +137,21 @@ set_target_properties( 1.1 ) @@ -15,6 +15,11 @@ index 11d14e4..8180f21 100644 + find_path(TCLAP_INCLUDE_DIRS "tclap/Arg.h") + target_include_directories(libopencc PUBLIC ${TCLAP_INCLUDE_DIRS}) +endif() ++ ++if(USE_SYSTEM_DARTS) ++ find_path(DARTS_INCLUDE_DIRS "darts.h") ++ target_include_directories(libopencc PUBLIC ${DARTS_INCLUDE_DIRS}) ++endif() + # Installation diff --git a/ports/opencc/portfile.cmake b/ports/opencc/portfile.cmake index 011972bbc1f..dc000f7ea86 100644 --- a/ports/opencc/portfile.cmake +++ b/ports/opencc/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_cmake_configure( -DENABLE_GTEST=OFF -DUSE_SYSTEM_RAPIDJSON=ON -DUSE_SYSTEM_TCLAP=ON + -DUSE_SYSTEM_DARTS=ON ) vcpkg_cmake_install( diff --git a/ports/opencc/vcpkg.json b/ports/opencc/vcpkg.json index d38937130d9..49833f4832b 100644 --- a/ports/opencc/vcpkg.json +++ b/ports/opencc/vcpkg.json @@ -1,12 +1,13 @@ { "name": "opencc", "version": "1.1.4", - "port-version": 2, + "port-version": 3, "description": "A project for conversions between Traditional Chinese, Simplified Chinese and Japanese Kanji (Shinjitai)", "homepage": "https://github.com/BYVoid/OpenCC", "license": "Apache-2.0", "supports": "!(arm | uwp)", "dependencies": [ + "darts-clone", "rapidjson", "tclap", { diff --git a/versions/baseline.json b/versions/baseline.json index fc278380042..6ff980f20b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5210,7 +5210,7 @@ }, "opencc": { "baseline": "1.1.4", - "port-version": 2 + "port-version": 3 }, "opencensus-cpp": { "baseline": "2021-08-26", diff --git a/versions/o-/opencc.json b/versions/o-/opencc.json index fb8782bd2f0..8ee07aa68a6 100644 --- a/versions/o-/opencc.json +++ b/versions/o-/opencc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "463a25b4f9bfe6a259042a54cdd813ae7f96f4c9", + "version": "1.1.4", + "port-version": 3 + }, { "git-tree": "2339a48f2758995166b42d82c9eb22c880190ac3", "version": "1.1.4",