[nuspell] Update port to v5.1.1 (#26797)

* [nuspell] Update port to v5.1.1

* x-add-version
This commit is contained in:
Dimitrij Mijoski 2022-09-15 20:44:33 +02:00 committed by GitHub
parent 71115afccd
commit de20eeed0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 37 deletions

View File

@ -1,30 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b54c54..7c6f3a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,10 @@ find_package(ICU 60 REQUIRED COMPONENTS uc data)
get_directory_property(subproject PARENT_DIRECTORY)
add_subdirectory(src/nuspell)
+option(BUILD_TOOLS "Build the tools." OFF)
+if (BUILD_TOOLS)
add_subdirectory(src/tools)
+endif()
if (subproject)
# if added as subproject just build Nuspell
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 3e63610..7597a6d 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -3,6 +3,10 @@ set_target_properties(nuspell-exe PROPERTIES RUNTIME_OUTPUT_NAME nuspell)
target_compile_definitions(nuspell-exe PRIVATE
PROJECT_VERSION=\"${PROJECT_VERSION}\")
target_link_libraries(nuspell-exe Nuspell::nuspell)
+if (WIN32 AND NOT MINGW)
+ find_library(GETOPT_WIN32_LIBRARY getopt)
+ target_link_libraries(nuspell-exe ${GETOPT_WIN32_LIBRARY})
+endif()
if (BUILD_SHARED_LIBS AND WIN32)
# This should be PRE_LINK (or PRE_BUILD), so Vcpkg's POST_BUILD
# step (see VCPKG_APPLOCAL_DEPS) that copies dll can pick up nuspell.dll

View File

@ -1,10 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO nuspell/nuspell
REF v5.1.0
SHA512 08ce776d224c66ba4bdd8cb22943741f30e8e5ba03396bfef1db598321c9b0f8814dacffcb52287b3b669426c7b08e2c1a40323341a9ff9768a7187002e1d77a
REF v5.1.1
SHA512 c33a52e3603071d3281b7cdcfa42776cd7ecb998292939538e53e364cfff63227cf094cd88ee6072b8a857f5d85c984c359a16b480dd462dac9cfd602cfd6c2c
HEAD_REF master
PATCHES fix-tools.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

View File

@ -1,7 +1,6 @@
{
"name": "nuspell",
"version-semver": "5.1.0",
"port-version": 2,
"version-semver": "5.1.1",
"description": [
"Nuspell is a fast and safe spelling checker software program.",
"It is designed for languages with rich morphology and complex word compounding.",

View File

@ -5117,8 +5117,8 @@
"port-version": 0
},
"nuspell": {
"baseline": "5.1.0",
"port-version": 2
"baseline": "5.1.1",
"port-version": 0
},
"nvtt": {
"baseline": "2.1.2",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0daf4a7623ab68c7f706b815dbe29e8f4627668e",
"version-semver": "5.1.1",
"port-version": 0
},
{
"git-tree": "5719acdfd3465a7bb3dfac85ce2821c56d7c652a",
"version-semver": "5.1.0",