Received: by mail.netbsd.org (Postfix, from userid 605) id 796CF84D7A; Thu, 19 Jan 2023 00:53:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A6D3484D50 for ; Thu, 19 Jan 2023 00:53:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id YuBCbW0Uk9DN for ; Thu, 19 Jan 2023 00:53:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B4E3084CF9 for ; Thu, 19 Jan 2023 00:53:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A3C42FA90; Thu, 19 Jan 2023 00:53:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1674089622128270" MIME-Version: 1.0 Date: Thu, 19 Jan 2023 00:53:42 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/textproc/hunspell To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230119005342.A3C42FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1674089622128270 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Thu Jan 19 00:53:42 UTC 2023 Modified Files: pkgsrc/textproc/hunspell: Makefile distinfo pkgsrc/textproc/hunspell/patches: patch-aa patch-ab patch-ac Added Files: pkgsrc/textproc/hunspell/patches: patch-configure.ac Removed Files: pkgsrc/textproc/hunspell: options.mk Log Message: hunspell: update to 1.7.2 * Crash fixes, code clean-up in ~200 commits * tdf#136306 don't accept/suggest typos as 3-or-more-word compound words * Prepare optional spelling mode of LibreOffice to not accept/suggest not dictionary-based words as compound words (#517) * Merge in weblate translations While here: Fix libcurses detection on NetBSD. However, switch to ncursesw to get Unicode support, hunspell doesn't recognize wide character support in NetBSD curses. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 pkgsrc/textproc/hunspell/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/hunspell/distinfo cvs rdiff -u -r1.9 -r0 pkgsrc/textproc/hunspell/options.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/hunspell/patches/patch-aa cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/hunspell/patches/patch-ab \ pkgsrc/textproc/hunspell/patches/patch-ac cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/hunspell/patches/patch-configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1674089622128270 Content-Disposition: inline Content-Length: 6223 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/hunspell/Makefile diff -u pkgsrc/textproc/hunspell/Makefile:1.40 pkgsrc/textproc/hunspell/Makefile:1.41 --- pkgsrc/textproc/hunspell/Makefile:1.40 Fri Sep 9 15:17:20 2022 +++ pkgsrc/textproc/hunspell/Makefile Thu Jan 19 00:53:42 2023 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.40 2022/09/09 15:17:20 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2023/01/19 00:53:42 wiz Exp $ -DISTNAME= hunspell-1.7.1 +DISTNAME= hunspell-1.7.2 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GITHUB:=hunspell/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -38,8 +38,7 @@ REPLACE_PERL= src/tools/ispellaff2myspel post-patch: cd ${WRKSRC} && ${TOOLS_PATH.autoreconf} -v -i --force -.include "options.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../mk/curses.buildlink3.mk" +.include "../../devel/ncursesw/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/hunspell/distinfo diff -u pkgsrc/textproc/hunspell/distinfo:1.16 pkgsrc/textproc/hunspell/distinfo:1.17 --- pkgsrc/textproc/hunspell/distinfo:1.16 Fri Sep 9 15:17:20 2022 +++ pkgsrc/textproc/hunspell/distinfo Thu Jan 19 00:53:42 2023 @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.16 2022/09/09 15:17:20 wiz Exp $ +$NetBSD: distinfo,v 1.17 2023/01/19 00:53:42 wiz Exp $ -BLAKE2s (hunspell-1.7.1.tar.gz) = 23bef2131389cea1468e6b48d411cc9c855353e46d6cb45e2005e394e25a6a4d -SHA512 (hunspell-1.7.1.tar.gz) = 472249309aecbbc58a025445781268867173e0651a6147f29644975ad65af043a1e2fbe91f2094934526889c7f9944739dc0a5f0d25328a77d22db1fd8f055ec -Size (hunspell-1.7.1.tar.gz) = 526464 bytes -SHA1 (patch-aa) = 8c6102ddb2e449b6f1abc23f679e0f6f38bfd0b5 -SHA1 (patch-ab) = ee127b1d8f55ceefa807c2fa440885b4fa5d029c -SHA1 (patch-ac) = c25cdfe80452cb4ca9850354c9fa8581c787c086 +BLAKE2s (hunspell-1.7.2.tar.gz) = f63f12bf600e05c58720f27ab30ff5d7d3265f4f610a2cb15b7a17f55bd3704d +SHA512 (hunspell-1.7.2.tar.gz) = d007edc8cb7ff95048361418b088bb062962973247c940aa826c9859a5ef90a9734100bffe7c7ac9a774f2e233605e814efb9e7fd3fc8c4ef4b978e9ec990cba +Size (hunspell-1.7.2.tar.gz) = 981394 bytes +SHA1 (patch-aa) = 75bc2e099acf2bf3b1caba75b616ef38ee851b70 +SHA1 (patch-ab) = 489e8e4f978ff531322a445612f836c2d90e4e64 +SHA1 (patch-ac) = 869175eceeaba245ddda65ce6043eb243c6dd039 +SHA1 (patch-configure.ac) = 0610ecc9ad8bc9ac5b523ffecb27011854f5e023 SHA1 (patch-src_tools_Makefile.am) = e5f67855c48e04fe12deb90904c9c27e2441a8cf Index: pkgsrc/textproc/hunspell/patches/patch-aa diff -u pkgsrc/textproc/hunspell/patches/patch-aa:1.3 pkgsrc/textproc/hunspell/patches/patch-aa:1.4 --- pkgsrc/textproc/hunspell/patches/patch-aa:1.3 Tue Oct 23 11:45:34 2018 +++ pkgsrc/textproc/hunspell/patches/patch-aa Thu Jan 19 00:53:42 2023 @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2018/10/23 11:45:34 bsiegert Exp $ +$NetBSD: patch-aa,v 1.4 2023/01/19 00:53:42 wiz Exp $ ---- src/hunspell/hunzip.hxx.orig 2017-09-03 11:38:44.000000000 +0000 +--- src/hunspell/hunzip.hxx.orig 2022-12-29 20:10:49.000000000 +0000 +++ src/hunspell/hunzip.hxx @@ -41,6 +41,10 @@ #ifndef HUNZIP_HXX_ @@ -12,4 +12,4 @@ $NetBSD: patch-aa,v 1.3 2018/10/23 11:45 + #include "hunvisapi.h" - #include + #include Index: pkgsrc/textproc/hunspell/patches/patch-ab diff -u pkgsrc/textproc/hunspell/patches/patch-ab:1.2 pkgsrc/textproc/hunspell/patches/patch-ab:1.3 --- pkgsrc/textproc/hunspell/patches/patch-ab:1.2 Tue Oct 23 11:45:34 2018 +++ pkgsrc/textproc/hunspell/patches/patch-ab Thu Jan 19 00:53:42 2023 @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2018/10/23 11:45:34 bsiegert Exp $ +$NetBSD: patch-ab,v 1.3 2023/01/19 00:53:42 wiz Exp $ ---- src/hunspell/phonet.cxx.orig 2017-09-03 11:38:44.000000000 +0000 +--- src/hunspell/phonet.cxx.orig 2022-12-29 20:10:49.000000000 +0000 +++ src/hunspell/phonet.cxx @@ -35,6 +35,15 @@ #include "csutil.hxx" @@ -16,5 +16,5 @@ $NetBSD: patch-ab,v 1.2 2018/10/23 11:45 +#endif + void init_phonet_hash(phonetable& parms) { - for (int i = 0; i < HASHSIZE; i++) { - parms.hash[i] = -1; + memset(parms.hash, 0xff, HASHSIZE * sizeof(int)); + Index: pkgsrc/textproc/hunspell/patches/patch-ac diff -u pkgsrc/textproc/hunspell/patches/patch-ac:1.2 pkgsrc/textproc/hunspell/patches/patch-ac:1.3 --- pkgsrc/textproc/hunspell/patches/patch-ac:1.2 Tue Oct 23 11:45:34 2018 +++ pkgsrc/textproc/hunspell/patches/patch-ac Thu Jan 19 00:53:42 2023 @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.2 2018/10/23 11:45:34 bsiegert Exp $ +$NetBSD: patch-ac,v 1.3 2023/01/19 00:53:42 wiz Exp $ ---- src/hunspell/replist.cxx.orig 2017-09-03 11:38:44.000000000 +0000 +--- src/hunspell/replist.cxx.orig 2022-12-29 20:10:49.000000000 +0000 +++ src/hunspell/replist.cxx @@ -76,6 +76,15 @@ #include "replist.hxx" @@ -16,5 +16,5 @@ $NetBSD: patch-ac,v 1.2 2018/10/23 11:45 +#endif + RepList::RepList(int n) { - dat = (replentry**)malloc(sizeof(replentry*) * n); - if (dat == 0) + dat.reserve(std::min(n, 16384)); + } Added files: Index: pkgsrc/textproc/hunspell/patches/patch-configure.ac diff -u /dev/null pkgsrc/textproc/hunspell/patches/patch-configure.ac:1.1 --- /dev/null Thu Jan 19 00:53:42 2023 +++ pkgsrc/textproc/hunspell/patches/patch-configure.ac Thu Jan 19 00:53:42 2023 @@ -0,0 +1,30 @@ +$NetBSD: patch-configure.ac,v 1.1 2023/01/19 00:53:42 wiz Exp $ + +Check for symbol that is in libcurses not, not in in libterminfo. + +--- configure.ac.orig 2022-12-29 20:10:49.000000000 +0000 ++++ configure.ac +@@ -52,11 +52,11 @@ AC_ARG_WITH( + [with_ui=no] + ) + AS_IF([test "x$with_ui" != xno], [ +- AC_CHECK_LIB([ncursesw],[tparm],[ ++ AC_CHECK_LIB([ncursesw],[ungetch],[ + CURSESLIB=-lncursesw +- ],[AC_CHECK_LIB([curses],[tparm],[ ++ ],[AC_CHECK_LIB([curses],[ungetch],[ + CURSESLIB=-lcurses +- ],[AC_CHECK_LIB([ncurses],[tparm],[ ++ ],[AC_CHECK_LIB([ncurses],[ungetch],[ + CURSESLIB=-lncurses + ])])]) + if test "$CURSESLIB" != "" ; then +@@ -82,7 +82,7 @@ READLINELIB="" + AS_IF([test "x$with_readline" != xno], + [AC_CHECK_LIB([tinfo],[tgetent], [ + TERMLIB=-ltinfo +- ],[AC_CHECK_LIB([curses],[tparm],[ ++ ],[AC_CHECK_LIB([curses],[ungetch],[ + TERMLIB=-lncurses + ],[AC_CHECK_LIB([termcap],[tgetent],[ + TERMLIB=-ltermcap --_----------=_1674089622128270--