From cd766ee9f4b843de23d26b7535d37876b278938a Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 3 Oct 2023 07:10:08 +0800 Subject: [PATCH] [hunspell] update to 1.7.2 (#34199) --- ports/hunspell/0001_fix_unistd.patch | 42 ---------------------------- ports/hunspell/portfile.cmake | 5 ++-- ports/hunspell/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/h-/hunspell.json | 5 ++++ 5 files changed, 10 insertions(+), 49 deletions(-) delete mode 100644 ports/hunspell/0001_fix_unistd.patch diff --git a/ports/hunspell/0001_fix_unistd.patch b/ports/hunspell/0001_fix_unistd.patch deleted file mode 100644 index 9ea198b951..0000000000 --- a/ports/hunspell/0001_fix_unistd.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/tools/hzip.cxx b/src/tools/hzip.cxx -index d7d2d2464..30bb5a32c 100644 ---- a/src/tools/hzip.cxx -+++ b/src/tools/hzip.cxx -@@ -38,10 +38,13 @@ - /* hzip: file compression for sorted dictionaries with optional encryption, - * algorithm: prefix-suffix encoding and 16-bit Huffman encoding */ - -+#include - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif /* HAVE_UNISTD_H */ - #include - #include - -diff --git a/src/tools/munch.cxx b/src/tools/munch.cxx -index e33ac71e3..1e8342ff5 100644 ---- a/src/tools/munch.cxx -+++ b/src/tools/munch.cxx -@@ -40,7 +40,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/src/tools/unmunch.cxx b/src/tools/unmunch.cxx -index 5a73e6fe9..3d9e31832 100644 ---- a/src/tools/unmunch.cxx -+++ b/src/tools/unmunch.cxx -@@ -42,7 +42,6 @@ - #include - #include - #include --#include - #include - #include - #include diff --git a/ports/hunspell/portfile.cmake b/ports/hunspell/portfile.cmake index dd441f939f..0311f4be3c 100644 --- a/ports/hunspell/portfile.cmake +++ b/ports/hunspell/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hunspell/hunspell - REF v1.7.1 - SHA512 472249309aecbbc58a025445781268867173e0651a6147f29644975ad65af043a1e2fbe91f2094934526889c7f9944739dc0a5f0d25328a77d22db1fd8f055ec + REF "v${VERSION}" + SHA512 d007edc8cb7ff95048361418b088bb062962973247c940aa826c9859a5ef90a9734100bffe7c7ac9a774f2e233605e814efb9e7fd3fc8c4ef4b978e9ec990cba HEAD_REF master PATCHES - 0001_fix_unistd.patch # from https://github.com/hunspell/hunspell/commit/60980f2bfe6678cca98bea2bf37f0b11bb34f4c5 0005-autotools-subdirs.patch ) diff --git a/ports/hunspell/vcpkg.json b/ports/hunspell/vcpkg.json index 42c35b8e61..a8399f4315 100644 --- a/ports/hunspell/vcpkg.json +++ b/ports/hunspell/vcpkg.json @@ -1,7 +1,6 @@ { "name": "hunspell", - "version": "1.7.1", - "port-version": 4, + "version": "1.7.2", "description": "The most popular spellchecking library.", "homepage": "https://github.com/hunspell/hunspell", "license": "MPL-1.1 OR LGPL-2.1-or-later OR GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 41f05a9714..9c550364ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3261,8 +3261,8 @@ "port-version": 3 }, "hunspell": { - "baseline": "1.7.1", - "port-version": 4 + "baseline": "1.7.2", + "port-version": 0 }, "hwloc": { "baseline": "2.9.0", diff --git a/versions/h-/hunspell.json b/versions/h-/hunspell.json index 1e1ac1b1b3..4ea29fa142 100644 --- a/versions/h-/hunspell.json +++ b/versions/h-/hunspell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "adbb8a9460f3c540d3d5719c519c32b97b3f5844", + "version": "1.7.2", + "port-version": 0 + }, { "git-tree": "661af60066452aeb627f9cf0675303b7ac677a02", "version": "1.7.1",