diff options
| author | Stefan Löffler <st.loeffler@gmail.com> | 2017-04-30 20:01:09 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2017-05-18 23:33:51 (GMT) |
| commit | c2742a8777f726775e1457f09945b3e1c4d642b3 (patch) | |
| tree | c2af7afcbed73ed633d762f0356341ac10ade911 | |
| parent | ef7579f9c25dfc6cccca2d1827ff9045b09786e7 (diff) | |
| download | mxe-c2742a8777f726775e1457f09945b3e1c4d642b3.zip mxe-c2742a8777f726775e1457f09945b3e1c4d642b3.tar.gz mxe-c2742a8777f726775e1457f09945b3e1c4d642b3.tar.bz2 | |
Update hunspell to 1.6.1
| -rw-r--r-- | src/hunspell-test.cpp | 12 | ||||
| -rw-r--r-- | src/hunspell.mk | 14 |
2 files changed, 14 insertions, 12 deletions
diff --git a/src/hunspell-test.cpp b/src/hunspell-test.cpp index 037fa32..1446f59 100644 --- a/src/hunspell-test.cpp +++ b/src/hunspell-test.cpp @@ -4,6 +4,8 @@ #include <iostream> #include <fstream> +#include <string> +#include <vector> #include <hunspell.hxx> int main(int argc, char *argv[]) @@ -19,18 +21,18 @@ int main(int argc, char *argv[]) aff.close(); Hunspell h("hunspell-test.aff", "hunspell-test.dic"); - if (h.spell("Hello") == 0) + if (h.spell(std::string("Hello")) == 0) { std::cerr << "Error: hunspell marked correct word as wrong" << std::endl; } - if (h.spell("wrld") != 0) + if (h.spell(std::string("wrld")) != 0) { std::cerr << "Error: hunspell marked wrong word as correct" << std::endl; } - char ** result; - int n = h.suggest(&result, "ell"); - for (int i = 0; i < n; i++) std::cout << result[i]; + std::vector<std::string> result; + result = h.suggest(std::string("ell")); + for (unsigned int i = 0; i < result.size(); i++) std::cout << result[i]; return 0; } diff --git a/src/hunspell.mk b/src/hunspell.mk index 8c006d8..e9e66cc 100644 --- a/src/hunspell.mk +++ b/src/hunspell.mk @@ -1,25 +1,25 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := hunspell -$(PKG)_WEBSITE := https://hunspell.sourceforge.io/ +$(PKG)_WEBSITE := http://hunspell.github.io/ $(PKG)_DESCR := Hunspell $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.3 -$(PKG)_CHECKSUM := a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c +$(PKG)_VERSION := 1.6.1 +$(PKG)_CHECKSUM := 30f593733c50b794016bb03d31fd2a2071e4610c6fa4708e33edad2335102c49 $(PKG)_SUBDIR := hunspell-$($(PKG)_VERSION) $(PKG)_FILE := hunspell-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/hunspell/Hunspell/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := https://github.com/hunspell/hunspell/archive/v$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := gcc gettext libiconv pthreads readline define $(PKG)_UPDATE - $(WGET) -q -O- 'https://sourceforge.net/projects/hunspell/files/Hunspell/' | \ - $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ + $(WGET) -q -O- 'https://github.com/hunspell/hunspell/releases' | \ + $(SED) -n 's,.*/archive/v\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef define $(PKG)_BUILD # Note: the configure file doesn't pick up pdcurses, so "ui" is disabled - cd '$(1)' && ./configure \ + cd '$(1)' && autoreconf -vfi && ./configure \ $(MXE_CONFIGURE_OPTS) \ --with-warnings \ --without-ui \ |