[opencc] Update to 1.4.1 (#53294)

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-08-10 21:54:44 +02:00 · 2026-08-10 21:54:44 +02:00 · 599e3bc68b
parent 0b34abccf7
commit 599e3bc68b
6 changed files with 102 additions and 111 deletions
--- a/ports/opencc/enable-cpp17.patch
+++ b/ports/opencc/enable-cpp17.patch
@ -1,39 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1d8c8e6..8979a5e 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -72,7 +72,7 @@ include(CPack)
- 
- if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-     set(CMAKE_MACOSX_RPATH 1)
-    set(CMAKE_CXX_STANDARD 14)
-+    set(CMAKE_CXX_STANDARD 17)
-     set(CMAKE_CXX_STANDARD_REQUIRED ON)
- endif()
- 
-@@ -154,7 +154,7 @@ add_definitions(
- 
- if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-   add_definitions(
-    -std=c++14
-+    -std=c++17
-     -Wall
-   )
-   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
-@@ -163,7 +163,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-   endif ()
- elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-   add_definitions(
-    -std=c++14
-+    -std=c++17
-     -Wall
-   )
-   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
-@@ -174,6 +174,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-   add_definitions(
-     /W4
-     /D "_CRT_SECURE_NO_WARNINGS"
-+    /std:c++17
-   )
- endif()
- 
--- a/ports/opencc/fix-dependencies.patch
+++ b/ports/opencc/fix-dependencies.patch
@ -1,18 +1,44 @@
+diff --git a/cmake/GitVersion.cmake b/cmake/GitVersion.cmake
+index f0b44a97..5d0623e6 100644
+--- a/cmake/GitVersion.cmake
+++ b/cmake/GitVersion.cmake
+@@ -13,7 +13,7 @@
+ 
+ set(_OPENCC_FALLBACK_MAJOR 1)
+ set(_OPENCC_FALLBACK_MINOR 4)
+-set(_OPENCC_FALLBACK_REVISION 0)
+set(_OPENCC_FALLBACK_REVISION 1)
+ 
+ find_package(Git QUIET)
+ 
+diff --git a/OpenCCConfig.cmake.in b/OpenCCConfig.cmake.in
+index 7596d8d1..d747372e 100644
+--- a/OpenCCConfig.cmake.in
+++ b/OpenCCConfig.cmake.in
+@@ -1,5 +1,8 @@
+ @PACKAGE_INIT@
+ 
+include(CMakeFindDependencyMacro)
+find_dependency(RapidJSON CONFIG)
+
+ include(${CMAKE_CURRENT_LIST_DIR}/@OPENCC_TARGETS_EXPORT_NAME@.cmake)
+ 
+ set_and_check(OPENCC_INCLUDE_DIR @PACKAGE_DIR_INCLUDE@/opencc)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7768c89..70292d6 100644
+index 17538302..826a30ee 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -115,7 +115,7 @@ add_library(libopencc ${LIBOPENCC_SOURCES} ${LIBOPENCC_HEADERS})
- add_library(OpenCC::OpenCC ALIAS libopencc)
- set_target_properties(libopencc PROPERTIES POSITION_INDEPENDENT_CODE ON)
- source_group(libopencc FILES ${LIBOPENCC_SOURCES} ${LIBOPENCC_HEADERS})
+@@ -146,7 +146,7 @@ source_group(libopencc FILES
+   ${LIBOPENCC_HEADERS}
+   ${LIBOPENCC_PRIVATE_HEADERS}
+ )
 -target_link_libraries(libopencc marisa)
 +target_link_libraries(libopencc ${LIBMARISA})
- target_include_directories(libopencc PUBLIC
-     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-     $<INSTALL_INTERFACE:${DIR_INCLUDE}/opencc>
-@@ -144,6 +144,21 @@ set_target_properties(
-       ${OPENCC_VERSION_MAJOR}.${OPENCC_VERSION_MINOR}
+ if (NOT BUILD_SHARED_LIBS)
+   target_compile_definitions(libopencc PUBLIC Opencc_BUILT_AS_STATIC)
+ endif()
+@@ -187,6 +187,21 @@ set_target_properties(
+       ${OPENCC_ABI_VERSION}
 )
 
 +if(USE_SYSTEM_RAPIDJSON)
--- a/ports/opencc/portfile.cmake
+++ b/ports/opencc/portfile.cmake
@ -1,58 +1,58 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO BYVoid/OpenCC
-    REF "ver.${VERSION}"
-    SHA512 713cf00931d7616994eb455eef3bc893096b5cd6d42b346aa1130591752d9612891ea3ed035bd7bd4ec7df1c90425e86375f5b3337fac11663c656c79a8f33e9
-    HEAD_REF master
-    PATCHES 
-        fix-dependencies.patch
-        # marisa-trie/0.3.0 requires C++17, so we need to enable it
-        enable-cpp17.patch
-)
-
-vcpkg_find_acquire_program(PYTHON3)
-get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
-vcpkg_add_to_path("${PYTHON3_DIR}")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DBUILD_DOCUMENTATION=OFF
-        -DENABLE_GTEST=OFF
-        -DUSE_SYSTEM_RAPIDJSON=ON
-        -DUSE_SYSTEM_TCLAP=ON
-        -DUSE_SYSTEM_DARTS=ON
-        -DUSE_SYSTEM_MARISA=ON
-        -DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf
-)
-
-vcpkg_cmake_install(
-    DISABLE_PARALLEL
-)
-
-vcpkg_copy_pdbs()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opencc)
-
-vcpkg_fixup_pkgconfig()
-
-set(tool_names "opencc" "opencc_dict" "opencc_phrase_extract")
-if("tools" IN_LIST FEATURES)
-    vcpkg_copy_tools(TOOL_NAMES ${tool_names} AUTO_CLEAN)
-endif()
-
-foreach(opencc_tool IN LISTS tool_names)
-    file(REMOVE
-        "${CURRENT_PACKAGES_DIR}/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
-        "${CURRENT_PACKAGES_DIR}/debug/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
-    )
-endforeach()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS)
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO BYVoid/OpenCC
+    REF "ver.${VERSION}"
+    SHA512 8638e5ca665c3451d716e5a65ddd998c5312975d0f69e5d0d72910104c9bc44a4989562468605db66f5f92e5ca1bf21815266dfe21a0d130bf5f02ebcbb7cba7
+    HEAD_REF master
+    PATCHES
+        fix-dependencies.patch
+)
+
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
+vcpkg_add_to_path("${PYTHON3_DIR}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_DOCUMENTATION=OFF
+        -DBUILD_OPENCC_JIEBA_PLUGIN=OFF
+        -DBUILD_PYTHON=OFF
+        -DENABLE_BENCHMARK=OFF
+        -DENABLE_GTEST=OFF
+        -DUSE_SYSTEM_RAPIDJSON=ON
+        -DUSE_SYSTEM_TCLAP=ON
+        -DUSE_SYSTEM_DARTS=ON
+        -DUSE_SYSTEM_MARISA=ON
+)
+
+vcpkg_cmake_install(
+    DISABLE_PARALLEL
+)
+
+vcpkg_copy_pdbs()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opencc)
+
+vcpkg_fixup_pkgconfig()
+
+set(tool_names "opencc" "opencc_dict" "opencc_phrase_extract")
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES ${tool_names} AUTO_CLEAN)
+endif()
+
+foreach(opencc_tool IN LISTS tool_names)
+    file(REMOVE
+        "${CURRENT_PACKAGES_DIR}/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
+        "${CURRENT_PACKAGES_DIR}/debug/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
+    )
+endforeach()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/ports/opencc/vcpkg.json
+++ b/ports/opencc/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "opencc",
-  "version": "1.1.9",
-  "port-version": 1,
+  "version": "1.4.1",
  "description": "A project for conversions between Traditional Chinese, Simplified Chinese and Japanese Kanji (Shinjitai)",
  "homepage": "https://github.com/BYVoid/OpenCC",
  "license": "Apache-2.0",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -7405,8 +7405,8 @@
      "port-version": 0
    },
    "opencc": {
-      "baseline": "1.1.9",
-      "port-version": 1
+      "baseline": "1.4.1",
+      "port-version": 0
    },
    "opencensus-cpp": {
      "baseline": "2021-08-26",
--- a/versions/o-/opencc.json
+++ b/versions/o-/opencc.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "5ee3f11e468771328fdec4b99af290c7ef3bbfb4",
+      "version": "1.4.1",
+      "port-version": 0
+    },
    {
      "git-tree": "584a6ecb3486de2586809e931d907dc81e9af309",
      "version": "1.1.9",