diff --git a/ports/marisa-trie/enable-debug.patch b/ports/marisa-trie/enable-debug.patch new file mode 100644 index 0000000000..e9bbb49816 --- /dev/null +++ b/ports/marisa-trie/enable-debug.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a00be40..1fce4fb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -256,7 +256,6 @@ endif() + install( + TARGETS marisa + EXPORT MarisaTargets +- CONFIGURATIONS Release + DESTINATION ${LIB_INSTALL_DIR} + COMPONENT Library + ) +@@ -270,7 +269,6 @@ install( + if(ENABLE_TOOLS) + install( + TARGETS ${MARISA_TOOLS} +- CONFIGURATIONS Release + COMPONENT Binaries + ) + endif() diff --git a/ports/marisa-trie/fix-install.patch b/ports/marisa-trie/fix-install.patch new file mode 100644 index 0000000000..1465f3802e --- /dev/null +++ b/ports/marisa-trie/fix-install.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1fce4fb..e56f0a2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -256,20 +256,21 @@ endif() + install( + TARGETS marisa + EXPORT MarisaTargets +- DESTINATION ${LIB_INSTALL_DIR} +- COMPONENT Library ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + ) + install( + DIRECTORY include/ + DESTINATION include + COMPONENT Library + FILES_MATCHING PATTERN "*.h" + ) + + if(ENABLE_TOOLS) + install( + TARGETS ${MARISA_TOOLS} + COMPONENT Binaries + ) + endif() + diff --git a/ports/marisa-trie/portfile.cmake b/ports/marisa-trie/portfile.cmake index 063aaeff26..e1e8cd7c89 100644 --- a/ports/marisa-trie/portfile.cmake +++ b/ports/marisa-trie/portfile.cmake @@ -1,65 +1,43 @@ -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -endif() - -if(VCPKG_TARGET_IS_LINUX) - message(WARNING "${PORT} currently requires the following packages:\n libtool\n This can be installed on Ubuntu systems via\n sudo apt-get install -y libtool\n") +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO s-yata/marisa-trie - REF 006020c1df76d0d7dc6118dacc22da64da2e35c4 - SHA512 05dd7cc81a6347d4528654c19617af16de8d7352ad9e38d5f1cd296d88527377ecbfed9dbe722362d64369cd792d1ae0410319854b546ce0b6081ac560a40c0f + REF v${VERSION} + SHA512 6d72b13daec877c9c42e2c93e591e3a5e9c738bb130c5d90d6adfde81d5b500684ca176439b7502d9243b6417f34c7b39750ff3fb3a5c52d8d06cb9bc5f14c22 HEAD_REF master PATCHES - remove-windows-tests.patch + enable-debug.patch + fix-install.patch ) -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_install_msbuild( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH "vs2019/vs2019.sln" - LICENSE_SUBPATH COPYING.md - PLATFORM "${TRIPLET_SYSTEM_ARCH}" - ALLOW_ROOT_INCLUDES - ) +vcpkg_check_features(OUT_FEATURE_OPTIONS options + FEATURES + tools ENABLE_TOOLS +) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/marisa") - file(INSTALL "${SOURCE_PATH}/include/marisa.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") - file(GLOB MARISA_DIR_HEADERS "${SOURCE_PATH}/include/marisa/*.h") - file(INSTALL ${MARISA_DIR_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/marisa") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${options} +) - vcpkg_clean_msbuild() - set(prefix "${CURRENT_INSTALLED_DIR}") - set(exec_prefix "\${prefix}") - set(bindir "\${prefix}/bin") - set(libdir "\${prefix}/lib") - set(includedir "\${prefix}/include") - configure_file("${SOURCE_PATH}/marisa.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/marisa.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/marisa.pc" "-lmarisa" "-llibmarisa") - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(prefix "${CURRENT_INSTALLED_DIR}/debug") - set(exec_prefix "\${prefix}") - set(bindir "\${prefix}/bin") - set(libdir "\${prefix}/lib") - set(includedir "\${prefix}/include") - configure_file("${SOURCE_PATH}/marisa.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/marisa.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/marisa.pc" "-lmarisa" "-llibmarisa") - endif() -else() - vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG - COPY_SOURCE - ) - vcpkg_install_make() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - file(INSTALL "${SOURCE_PATH}/COPYING.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -endif() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Marisa) vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +if ("tools" IN_LIST FEATURES) + set(TOOL_NAMES marisa-benchmark marisa-build marisa-common-prefix-search marisa-dump marisa-lookup marisa-predictive-search marisa-reverse-lookup) + vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") +endif() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.md") diff --git a/ports/marisa-trie/remove-windows-tests.patch b/ports/marisa-trie/remove-windows-tests.patch deleted file mode 100644 index 254dba4efc..0000000000 --- a/ports/marisa-trie/remove-windows-tests.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/vs2019/vs2019.sln b/vs2019/vs2019.sln -index df0ecfd..4382416 100644 ---- a/vs2019/vs2019.sln -+++ b/vs2019/vs2019.sln -@@ -5,16 +5,6 @@ VisualStudioVersion = 16.0.29519.87 - MinimumVisualStudioVersion = 10.0.40219.1 - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmarisa", "libmarisa\libmarisa.vcxproj", "{84009DAF-7FAF-44AC-A6AA-023EF63E3051}" - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base-test", "base-test\base-test.vcxproj", "{9C0CFD54-C5A7-4736-9063-7DCB085B2877}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "marisa-test", "marisa-test\marisa-test.vcxproj", "{53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "io-test", "io-test\io-test.vcxproj", "{F9C6E136-FE11-4F7E-A113-7A98AACDABC7}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "trie-test", "trie-test\trie-test.vcxproj", "{1654861A-6F01-4D7C-830B-A39678093E4C}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vector-test", "vector-test\vector-test.vcxproj", "{8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}" --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "marisa-benchmark", "marisa-benchmark\marisa-benchmark.vcxproj", "{CCD0AA2B-1461-4937-B3AD-487E541425FD}" - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "marisa-build", "marisa-build\marisa-build.vcxproj", "{3F2BDA56-422C-45F9-B2BC-5C19790E0D9D}" -@@ -45,46 +35,6 @@ Global - {84009DAF-7FAF-44AC-A6AA-023EF63E3051}.Release|x64.Build.0 = Release|x64 - {84009DAF-7FAF-44AC-A6AA-023EF63E3051}.Release|x86.ActiveCfg = Release|Win32 - {84009DAF-7FAF-44AC-A6AA-023EF63E3051}.Release|x86.Build.0 = Release|Win32 -- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Debug|x64.ActiveCfg = Debug|x64 -- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Debug|x64.Build.0 = Debug|x64 -- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Debug|x86.ActiveCfg = Debug|Win32 -- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Debug|x86.Build.0 = Debug|Win32 -- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Release|x64.ActiveCfg = Release|x64 -- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Release|x64.Build.0 = Release|x64 -- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Release|x86.ActiveCfg = Release|Win32 -- {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Release|x86.Build.0 = Release|Win32 -- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Debug|x64.ActiveCfg = Debug|x64 -- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Debug|x64.Build.0 = Debug|x64 -- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Debug|x86.ActiveCfg = Debug|Win32 -- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Debug|x86.Build.0 = Debug|Win32 -- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Release|x64.ActiveCfg = Release|x64 -- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Release|x64.Build.0 = Release|x64 -- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Release|x86.ActiveCfg = Release|Win32 -- {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Release|x86.Build.0 = Release|Win32 -- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Debug|x64.ActiveCfg = Debug|x64 -- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Debug|x64.Build.0 = Debug|x64 -- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Debug|x86.ActiveCfg = Debug|Win32 -- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Debug|x86.Build.0 = Debug|Win32 -- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Release|x64.ActiveCfg = Release|x64 -- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Release|x64.Build.0 = Release|x64 -- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Release|x86.ActiveCfg = Release|Win32 -- {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Release|x86.Build.0 = Release|Win32 -- {1654861A-6F01-4D7C-830B-A39678093E4C}.Debug|x64.ActiveCfg = Debug|x64 -- {1654861A-6F01-4D7C-830B-A39678093E4C}.Debug|x64.Build.0 = Debug|x64 -- {1654861A-6F01-4D7C-830B-A39678093E4C}.Debug|x86.ActiveCfg = Debug|Win32 -- {1654861A-6F01-4D7C-830B-A39678093E4C}.Debug|x86.Build.0 = Debug|Win32 -- {1654861A-6F01-4D7C-830B-A39678093E4C}.Release|x64.ActiveCfg = Release|x64 -- {1654861A-6F01-4D7C-830B-A39678093E4C}.Release|x64.Build.0 = Release|x64 -- {1654861A-6F01-4D7C-830B-A39678093E4C}.Release|x86.ActiveCfg = Release|Win32 -- {1654861A-6F01-4D7C-830B-A39678093E4C}.Release|x86.Build.0 = Release|Win32 -- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Debug|x64.ActiveCfg = Debug|x64 -- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Debug|x64.Build.0 = Debug|x64 -- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Debug|x86.ActiveCfg = Debug|Win32 -- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Debug|x86.Build.0 = Debug|Win32 -- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Release|x64.ActiveCfg = Release|x64 -- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Release|x64.Build.0 = Release|x64 -- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Release|x86.ActiveCfg = Release|Win32 -- {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Release|x86.Build.0 = Release|Win32 - {CCD0AA2B-1461-4937-B3AD-487E541425FD}.Debug|x64.ActiveCfg = Debug|x64 - {CCD0AA2B-1461-4937-B3AD-487E541425FD}.Debug|x64.Build.0 = Debug|x64 - {CCD0AA2B-1461-4937-B3AD-487E541425FD}.Debug|x86.ActiveCfg = Debug|Win32 diff --git a/ports/marisa-trie/usage b/ports/marisa-trie/usage deleted file mode 100644 index 2dadcffa13..0000000000 --- a/ports/marisa-trie/usage +++ /dev/null @@ -1,5 +0,0 @@ -The package marisa-trie can be imported via CMake FindPkgConfig module: - - find_package(PkgConfig REQUIRED) - pkg_check_modules(marisa REQUIRED IMPORTED_TARGET marisa) - target_link_libraries(main PkgConfig::marisa) diff --git a/ports/marisa-trie/vcpkg.json b/ports/marisa-trie/vcpkg.json index 6b69590a8f..f68dc5825a 100644 --- a/ports/marisa-trie/vcpkg.json +++ b/ports/marisa-trie/vcpkg.json @@ -1,9 +1,23 @@ { "name": "marisa-trie", - "version": "0.2.6+20200926", - "port-version": 2, + "version": "0.3.0", "description": "Matching Algorithm with Recursively Implemented StorAge (MARISA) is a space-efficient trie data structure. This is a C++ library for an implementation of MARISA.", "homepage": "https://github.com/s-yata/marisa-trie", "license": "BSD-2-Clause OR LGPL-2.1-or-later", - "supports": "!windows | mingw | ((x86 | x64) & !staticcrt)" + "supports": "!windows | mingw | (windows & static)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Enables command-line tools" + } + } } diff --git a/ports/opencc/enable-cpp17.patch b/ports/opencc/enable-cpp17.patch new file mode 100644 index 0000000000..42151fd656 --- /dev/null +++ b/ports/opencc/enable-cpp17.patch @@ -0,0 +1,39 @@ +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() + diff --git a/ports/opencc/portfile.cmake b/ports/opencc/portfile.cmake index 7bc8ac5c57..283f19a644 100644 --- a/ports/opencc/portfile.cmake +++ b/ports/opencc/portfile.cmake @@ -2,10 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BYVoid/OpenCC REF "ver.${VERSION}" - SHA512 713cf00931d7616994eb455eef3bc893096b5cd6d42b346aa1130591752d9612891ea3ed035bd7bd4ec7df1c90425e86375f5b3337fac11663c656c79a8f33e9 + 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) diff --git a/ports/opencc/vcpkg.json b/ports/opencc/vcpkg.json index 97ecf841ce..cbf963feb6 100644 --- a/ports/opencc/vcpkg.json +++ b/ports/opencc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencc", "version": "1.1.9", + "port-version": 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", diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index cc7965bae3..a3ce7a4fca 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -359,6 +359,7 @@ offscale-libetcd-cpp:arm-uwp=fail offscale-libetcd-cpp:x64-uwp=fail open62541:x64-windows-static-md=fail opencc:arm64-windows=fail # opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected +opencc:x64-android=fail opencc(uwp)=fail # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP. opencl:arm-uwp=fail opencl:x64-uwp=fail @@ -1509,7 +1510,6 @@ opencascade[tbb]:x64-windows = cascade opencascade[tbb]:x64-windows-static = cascade opencascade[tbb]:x64-windows-static-md = cascade opencascade[tbb,vtk,freeimage](uwp) = cascade -opencc:x64-windows-static = cascade opencv[cuda,cudnn](osx) = cascade opencv[cuda,cudnn,dc1394,dnn-cuda,freetype,gdcm,gstreamer,gtk,halide,openexr,opengl,ovis,python,qt,sfm,tbb,vtk]:arm64-uwp = cascade opencv[cuda,cudnn,dc1394,dnn-cuda,freetype,gdcm,gstreamer,gtk,openexr,opengl,ovis,qt,sfm,tbb,vtk]:x64-uwp = cascade diff --git a/versions/baseline.json b/versions/baseline.json index 73d0630919..6b7b6935c7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6009,8 +6009,8 @@ "port-version": 0 }, "marisa-trie": { - "baseline": "0.2.6+20200926", - "port-version": 2 + "baseline": "0.3.0", + "port-version": 0 }, "marl": { "baseline": "2023-06-28", @@ -6866,7 +6866,7 @@ }, "opencc": { "baseline": "1.1.9", - "port-version": 0 + "port-version": 1 }, "opencensus-cpp": { "baseline": "2021-08-26", diff --git a/versions/m-/marisa-trie.json b/versions/m-/marisa-trie.json index 7ea3a8bdb8..2254369533 100644 --- a/versions/m-/marisa-trie.json +++ b/versions/m-/marisa-trie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6087bdf3aa5e9e20deacb8964d4d4c2a698ea4a", + "version": "0.3.0", + "port-version": 0 + }, { "git-tree": "feefc2975f0e3c3aa1b468bdffccb21e9ef4dd54", "version": "0.2.6+20200926", diff --git a/versions/o-/opencc.json b/versions/o-/opencc.json index f87b1ead86..12e2978a66 100644 --- a/versions/o-/opencc.json +++ b/versions/o-/opencc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "584a6ecb3486de2586809e931d907dc81e9af309", + "version": "1.1.9", + "port-version": 1 + }, { "git-tree": "e6bdb1f36889a641312f0f0dc91e8be0d800dcd5", "version": "1.1.9",