CVS commit: pkgsrc/editors/abiword

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Dec  2 21:51:06 UTC 2018

Modified Files:
        pkgsrc/editors/abiword: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/editors/abiword/patches:
            patch-src_af_xap_xp_enchant__checker.cpp

Log Message:
Port AbiWord to enchant2, bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 pkgsrc/editors/abiword/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/editors/abiword/buildlink3.mk
cvs rdiff -u -r1.75 -r1.76 pkgsrc/editors/abiword/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/abiword/patches/patch-src_af_xap_xp_enchant__checker.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/abiword/Makefile
diff -u pkgsrc/editors/abiword/Makefile:1.180 pkgsrc/editors/abiword/Makefile:1.181
--- pkgsrc/editors/abiword/Makefile:1.180       Sat Nov 24 19:14:09 2018
+++ pkgsrc/editors/abiword/Makefile     Sun Dec  2 21:51:06 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.180 2018/11/24 19:14:09 nia Exp $
+# $NetBSD: Makefile,v 1.181 2018/12/02 21:51:06 bsiegert Exp $
 
 .include       "Makefile.common"
 DISTNAME=      abiword-${ABIVERSION}
+PKGREVISION=   1
 CATEGORIES=    editors
 MASTER_SITES=  http://www.abiword.com/downloads/abiword/${PKGVERSION_NOREV}/source/
 
@@ -50,7 +51,7 @@ BUILDLINK_TRANSFORM+= opt:-no-undefined:
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/enchant2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/redland/buildlink3.mk"
 .include "../../time/libical/buildlink3.mk"

Index: pkgsrc/editors/abiword/buildlink3.mk
diff -u pkgsrc/editors/abiword/buildlink3.mk:1.19 pkgsrc/editors/abiword/buildlink3.mk:1.20
--- pkgsrc/editors/abiword/buildlink3.mk:1.19   Wed Nov 14 22:21:21 2018
+++ pkgsrc/editors/abiword/buildlink3.mk        Sun Dec  2 21:51:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2018/11/14 22:21:21 kleink Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2018/12/02 21:51:06 bsiegert Exp $
 
 BUILDLINK_TREE+=       abiword
 
@@ -16,7 +16,7 @@ BUILDLINK_PKGSRCDIR.abiword?= ../../edit
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/enchant2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/redland/buildlink3.mk"
 .include "../../time/libical/buildlink3.mk"

Index: pkgsrc/editors/abiword/distinfo
diff -u pkgsrc/editors/abiword/distinfo:1.75 pkgsrc/editors/abiword/distinfo:1.76
--- pkgsrc/editors/abiword/distinfo:1.75        Sat Nov 24 19:14:09 2018
+++ pkgsrc/editors/abiword/distinfo     Sun Dec  2 21:51:06 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.75 2018/11/24 19:14:09 nia Exp $
+$NetBSD: distinfo,v 1.76 2018/12/02 21:51:06 bsiegert Exp $
 
 SHA1 (abiword-3.0.2.tar.gz) = 8226e0962e6667e0a461955a0ac680a629e0b55a
 RMD160 (abiword-3.0.2.tar.gz) = fde551492b0cffa7d522082906f374490bd47f5c
@@ -25,5 +25,6 @@ SHA1 (patch-src_af_util_xp_ut__iconv.cpp
 SHA1 (patch-src_af_util_xp_ut__iconv.h) = bbcfa2098ea77d393feb50d69de9ae29fcce302f
 SHA1 (patch-src_af_util_xp_ut__mbtowc.cpp) = 01f6793651533e7e39f665e5c15e6c12e1c7b96d
 SHA1 (patch-src_af_util_xp_ut__misc.cpp) = f552ecbb87490355d8e74218dd59fd3961f1af5d
+SHA1 (patch-src_af_xap_xp_enchant__checker.cpp) = 5ad3b8bb4e186e998d7e8930247534c9f058c534
 SHA1 (patch-src_text_fmt_xp_fv__FrameEdit.h) = 684310bf9aece4ce72d004dfae9a4b4b6ca69570
 SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.cpp) = 5673e9341372913156f2f722229569199d97af4c

Added files:

Index: pkgsrc/editors/abiword/patches/patch-src_af_xap_xp_enchant__checker.cpp
diff -u /dev/null pkgsrc/editors/abiword/patches/patch-src_af_xap_xp_enchant__checker.cpp:1.1
--- /dev/null   Sun Dec  2 21:51:06 2018
+++ pkgsrc/editors/abiword/patches/patch-src_af_xap_xp_enchant__checker.cpp     Sun Dec  2 21:51:06 2018
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_af_xap_xp_enchant__checker.cpp,v 1.1 2018/12/02 21:51:06 bsiegert Exp $
+
+Adapt to new enchant API.
+
+--- src/af/xap/xp/enchant_checker.cpp.orig     2013-04-07 13:53:03.000000000 +0000
++++ src/af/xap/xp/enchant_checker.cpp
+@@ -127,7 +127,7 @@ EnchantChecker::_suggestWord (const UT_U
+                               pvSugg->addItem (ucszSugg);
+               }
+ 
+-              enchant_dict_free_suggestions (m_dict, suggestions);
++              enchant_dict_free_string_list (m_dict, suggestions);
+       }
+ 
+       return pvSugg;
+@@ -139,7 +139,7 @@ bool EnchantChecker::addToCustomDict (co
+ 
+       if (word && len) {
+               UT_UTF8String utf8 (word, len);
+-              enchant_dict_add_to_personal (m_dict, utf8.utf8_str(), utf8.byteLength());
++              enchant_dict_add (m_dict, utf8.utf8_str(), utf8.byteLength());
+               return true;
+       }
+       return false;
+@@ -150,7 +150,7 @@ bool EnchantChecker::isIgnored (const UT
+       UT_return_val_if_fail (m_dict, false);
+ 
+       UT_UTF8String ignore (toCorrect, toCorrectLen);
+-      return enchant_dict_is_in_session (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
++      return enchant_dict_is_added (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
+ }
+ 
+ void EnchantChecker::ignoreWord (const UT_UCSChar *toCorrect, size_t toCorrectLen)