[pkgsrc/trunk]: pkgsrc/www/gtkhtml314 Port gtkhtml314 to enchant2, bump revis...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc594af83cad
branches:  trunk
changeset: 325915:dc594af83cad
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Tue Nov 27 20:32:06 2018 +0000

description:
Port gtkhtml314 to enchant2, bump revision.

diffstat:

 www/gtkhtml314/Makefile                                                |   6 ++--
 www/gtkhtml314/buildlink3.mk                                           |   4 +-
 www/gtkhtml314/distinfo                                                |   3 +-
 www/gtkhtml314/patches/patch-components_editor_gtkhtml-spell-checker.c |  15 ++++++++++
 4 files changed, 22 insertions(+), 6 deletions(-)

diffs (76 lines):

diff -r 35b153de2761 -r dc594af83cad www/gtkhtml314/Makefile
--- a/www/gtkhtml314/Makefile   Tue Nov 27 19:49:57 2018 +0000
+++ b/www/gtkhtml314/Makefile   Tue Nov 27 20:32:06 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2018/11/14 22:22:36 kleink Exp $
+# $NetBSD: Makefile,v 1.90 2018/11/27 20:32:06 bsiegert Exp $
 #
 # PKGNAME derives from the supported API (still from
 # release 3.14). See also PLIST.
@@ -6,7 +6,7 @@
 
 DISTNAME=      gtkhtml-3.32.2
 PKGNAME=       ${DISTNAME:S/gtkhtml/gtkhtml314/}
-PKGREVISION=   44
+PKGREVISION=   45
 CATEGORIES=    www gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtkhtml/3.32/}
 EXTRACT_SUFX=  .tar.bz2
@@ -31,7 +31,7 @@
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
-.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/enchant2/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 35b153de2761 -r dc594af83cad www/gtkhtml314/buildlink3.mk
--- a/www/gtkhtml314/buildlink3.mk      Tue Nov 27 19:49:57 2018 +0000
+++ b/www/gtkhtml314/buildlink3.mk      Tue Nov 27 20:32:06 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2012/09/15 10:06:46 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2018/11/27 20:32:06 bsiegert Exp $
 
 BUILDLINK_TREE+=       gtkhtml314
 
@@ -10,7 +10,7 @@
 BUILDLINK_PKGSRCDIR.gtkhtml314?=       ../../www/gtkhtml314
 
 .include "../../devel/GConf/buildlink3.mk"
-.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/enchant2/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .endif # GTKHTML314_BUILDLINK3_MK
 
diff -r 35b153de2761 -r dc594af83cad www/gtkhtml314/distinfo
--- a/www/gtkhtml314/distinfo   Tue Nov 27 19:49:57 2018 +0000
+++ b/www/gtkhtml314/distinfo   Tue Nov 27 20:32:06 2018 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.29 2015/11/04 02:46:54 agc Exp $
+$NetBSD: distinfo,v 1.30 2018/11/27 20:32:06 bsiegert Exp $
 
 SHA1 (gtkhtml-3.32.2.tar.bz2) = db8a943ddeec0b86766e671e8f8c427706dbcdd4
 RMD160 (gtkhtml-3.32.2.tar.bz2) = b71afbd07c658c2ec6ac285cc428ac1943d39e46
 SHA512 (gtkhtml-3.32.2.tar.bz2) = a641a6e2208ad9db9ab3c3dc4696cf010b70f64d302b6f889a275db396544570ee5c894835a18ea94699375d0e2fd91fd7414a0546ce5f62bcb6d603d331b1d5
 Size (gtkhtml-3.32.2.tar.bz2) = 1217025 bytes
+SHA1 (patch-components_editor_gtkhtml-spell-checker.c) = 4d10e8b18ec7ecb7db1105f91bd5eed996b6accc
diff -r 35b153de2761 -r dc594af83cad www/gtkhtml314/patches/patch-components_editor_gtkhtml-spell-checker.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/gtkhtml314/patches/patch-components_editor_gtkhtml-spell-checker.c    Tue Nov 27 20:32:06 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-components_editor_gtkhtml-spell-checker.c,v 1.1 2018/11/27 20:32:06 bsiegert Exp $
+
+Replace deprecated function (removed in enchant2).
+
+--- components/editor/gtkhtml-spell-checker.c.orig     2010-09-13 12:16:10.000000000 +0000
++++ components/editor/gtkhtml-spell-checker.c
+@@ -376,7 +376,7 @@ gtkhtml_spell_checker_add_word (GtkhtmlS
+       if ((dict = spell_checker_request_dict (checker)) == NULL)
+               return;
+ 
+-      enchant_dict_add_to_pwl (dict, word, length);
++      enchant_dict_add (dict, word, length);
+       g_signal_emit (G_OBJECT (checker), signals[ADDED], 0, word, length);
+ }
+