From ec137756db53d7e06e24d24830ed46a478fdc2b7 Mon Sep 17 00:00:00 2001 From: chausner Date: Sat, 30 Apr 2022 23:24:33 +0200 Subject: [PATCH 1/4] Update nuspell to 5.1.0 --- ports/nuspell/portfile.cmake | 25 +++++++++++-------------- ports/nuspell/vcpkg.json | 13 +++++++++++-- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/ports/nuspell/portfile.cmake b/ports/nuspell/portfile.cmake index 3128018e3e72bf..9e52673c1bbca0 100644 --- a/ports/nuspell/portfile.cmake +++ b/ports/nuspell/portfile.cmake @@ -1,17 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nuspell/nuspell - REF v5.0.0 - SHA512 92605c5f0d413b86711fea3b993d656552d5e72440303d3e71907a503d060ead032dfeb0dd8dbb790f35599b8cca8854bdd8650f0560793d9c62a11aebccc2e5 + REF v5.1.0 + SHA512 08ce776d224c66ba4bdd8cb22943741f30e8e5ba03396bfef1db598321c9b0f8814dacffcb52287b3b669426c7b08e2c1a40323341a9ff9768a7187002e1d77a HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DBUILD_TESTING=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nuspell) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nuspell) vcpkg_fixup_pkgconfig( # nuspell.pc depends on icu-uc.pc which has -lm specified as private # library. Ignore this -lm, otherwise this function shows error @@ -20,10 +20,7 @@ vcpkg_fixup_pkgconfig( ) vcpkg_copy_tools(TOOL_NAMES nuspell AUTO_CLEAN) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) -file( - INSTALL ${SOURCE_PATH}/COPYING.LESSER - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nuspell/vcpkg.json b/ports/nuspell/vcpkg.json index 5840ce1c50b459..63442e55d8d98e 100644 --- a/ports/nuspell/vcpkg.json +++ b/ports/nuspell/vcpkg.json @@ -1,13 +1,22 @@ { "name": "nuspell", - "version-semver": "5.0.0", + "version-semver": "5.1.0", "description": [ "Nuspell is a fast and safe spelling checker software program.", "It is designed for languages with rich morphology and complex word compounding.", "Nuspell is written in modern C++ and it supports Hunspell dictionaries." ], "homepage": "https://nuspell.github.io/", + "license": "LGPL-3.0", "dependencies": [ - "icu" + "icu", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } From 62e917896e131429e97676e1c5a402fa219f6713 Mon Sep 17 00:00:00 2001 From: chausner Date: Sat, 30 Apr 2022 23:24:33 +0200 Subject: [PATCH 2/4] Update CI baseline --- versions/baseline.json | 2 +- versions/n-/nuspell.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index d24eaa5d93ee9e..aef921b8c9320c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4921,7 +4921,7 @@ "port-version": 0 }, "nuspell": { - "baseline": "5.0.0", + "baseline": "5.1.0", "port-version": 0 }, "nvtt": { diff --git a/versions/n-/nuspell.json b/versions/n-/nuspell.json index a6bb2cf2931856..142422f43582fd 100644 --- a/versions/n-/nuspell.json +++ b/versions/n-/nuspell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ad41e11268b59c416f604738c0e169110c6d8c1", + "version-semver": "5.1.0", + "port-version": 0 + }, { "git-tree": "80e078d3797fd83a92fd3a6d0f59a373e43beadb", "version-semver": "5.0.0", From 03dcc604edb3b1673e353141d4b3ae2cabeedc07 Mon Sep 17 00:00:00 2001 From: chausner Date: Sat, 30 Apr 2022 23:28:51 +0200 Subject: [PATCH 3/4] Fix license --- ports/nuspell/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/nuspell/vcpkg.json b/ports/nuspell/vcpkg.json index 63442e55d8d98e..7ec126bd67a0ec 100644 --- a/ports/nuspell/vcpkg.json +++ b/ports/nuspell/vcpkg.json @@ -7,7 +7,7 @@ "Nuspell is written in modern C++ and it supports Hunspell dictionaries." ], "homepage": "https://nuspell.github.io/", - "license": "LGPL-3.0", + "license": "LGPL-3.0-or-later", "dependencies": [ "icu", { From 6a722f5f6e4891245c19bab5e6829553daca6abc Mon Sep 17 00:00:00 2001 From: chausner Date: Sat, 30 Apr 2022 23:28:56 +0200 Subject: [PATCH 4/4] Update CI baseline --- versions/n-/nuspell.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/n-/nuspell.json b/versions/n-/nuspell.json index 142422f43582fd..06ba7265629aa3 100644 --- a/versions/n-/nuspell.json +++ b/versions/n-/nuspell.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8ad41e11268b59c416f604738c0e169110c6d8c1", + "git-tree": "53fb93bbc0d441813026ef171e32d7479ab839f3", "version-semver": "5.1.0", "port-version": 0 },