Tue Nov 27 20:32:06 2018 UTC ()
Port gtkhtml314 to enchant2, bump revision.


(bsiegert)
diff -r1.89 -r1.90 pkgsrc/www/gtkhtml314/Makefile
diff -r1.20 -r1.21 pkgsrc/www/gtkhtml314/buildlink3.mk
diff -r1.29 -r1.30 pkgsrc/www/gtkhtml314/distinfo
diff -r0 -r1.1 pkgsrc/www/gtkhtml314/patches/patch-components_editor_gtkhtml-spell-checker.c
cvs diff -r1.89 -r1.90 pkgsrc/www/gtkhtml314/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/gtkhtml314/Attic/Makefile 2018/11/14 22:22:36 1.89
+++ pkgsrc/www/gtkhtml314/Attic/Makefile 2018/11/27 20:32:06 1.90
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.89 2018/11/14 22:22:36 kleink Exp $ 1# $NetBSD: Makefile,v 1.90 2018/11/27 20:32:06 bsiegert Exp $
2# 2#
3# PKGNAME derives from the supported API (still from 3# PKGNAME derives from the supported API (still from
4# release 3.14). See also PLIST. 4# release 3.14). See also PLIST.
5# 5#
6 6
7DISTNAME= gtkhtml-3.32.2 7DISTNAME= gtkhtml-3.32.2
8PKGNAME= ${DISTNAME:S/gtkhtml/gtkhtml314/} 8PKGNAME= ${DISTNAME:S/gtkhtml/gtkhtml314/}
9PKGREVISION= 44 9PKGREVISION= 45
10CATEGORIES= www gnome 10CATEGORIES= www gnome
11MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtkhtml/3.32/} 11MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtkhtml/3.32/}
12EXTRACT_SUFX= .tar.bz2 12EXTRACT_SUFX= .tar.bz2
13 13
14MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
15HOMEPAGE= https://www.gnome.org/ 15HOMEPAGE= https://www.gnome.org/
16COMMENT= Lightweight HTML rendering/printing/editing engine 16COMMENT= Lightweight HTML rendering/printing/editing engine
17LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 17LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
18 18
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20CONFIGURE_ARGS+= --disable-deprecated_warning_flags 20CONFIGURE_ARGS+= --disable-deprecated_warning_flags
21USE_LIBTOOL= yes 21USE_LIBTOOL= yes
22USE_PKGLOCALEDIR= yes 22USE_PKGLOCALEDIR= yes
23USE_TOOLS+= gmake intltool msgfmt pkg-config 23USE_TOOLS+= gmake intltool msgfmt pkg-config
24 24
25PKGCONFIG_OVERRIDE+= components/editor/gtkhtml-editor.pc.in 25PKGCONFIG_OVERRIDE+= components/editor/gtkhtml-editor.pc.in
26PKGCONFIG_OVERRIDE+= gtkhtml/libgtkhtml.pc.in 26PKGCONFIG_OVERRIDE+= gtkhtml/libgtkhtml.pc.in
27 27
28.include "../../devel/gettext-lib/buildlink3.mk" 28.include "../../devel/gettext-lib/buildlink3.mk"
29.include "../../devel/GConf/buildlink3.mk" 29.include "../../devel/GConf/buildlink3.mk"
30.include "../../devel/pango/buildlink3.mk" 30.include "../../devel/pango/buildlink3.mk"
31.include "../../graphics/gnome-icon-theme/buildlink3.mk" 31.include "../../graphics/gnome-icon-theme/buildlink3.mk"
32.include "../../net/ORBit2/buildlink3.mk" 32.include "../../net/ORBit2/buildlink3.mk"
33.include "../../net/libsoup/buildlink3.mk" 33.include "../../net/libsoup/buildlink3.mk"
34.include "../../textproc/enchant/buildlink3.mk" 34.include "../../textproc/enchant2/buildlink3.mk"
35.include "../../textproc/iso-codes/buildlink3.mk" 35.include "../../textproc/iso-codes/buildlink3.mk"
36.include "../../x11/gtk2/buildlink3.mk" 36.include "../../x11/gtk2/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/www/gtkhtml314/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/www/gtkhtml314/Attic/buildlink3.mk 2012/09/15 10:06:46 1.20
+++ pkgsrc/www/gtkhtml314/Attic/buildlink3.mk 2018/11/27 20:32:06 1.21
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: buildlink3.mk,v 1.20 2012/09/15 10:06:46 obache Exp $ 1# $NetBSD: buildlink3.mk,v 1.21 2018/11/27 20:32:06 bsiegert Exp $
2 2
3BUILDLINK_TREE+= gtkhtml314 3BUILDLINK_TREE+= gtkhtml314
4 4
5.if !defined(GTKHTML314_BUILDLINK3_MK) 5.if !defined(GTKHTML314_BUILDLINK3_MK)
6GTKHTML314_BUILDLINK3_MK:= 6GTKHTML314_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gtkhtml314+= gtkhtml314>=3.24.0 8BUILDLINK_API_DEPENDS.gtkhtml314+= gtkhtml314>=3.24.0
9BUILDLINK_ABI_DEPENDS.gtkhtml314+= gtkhtml314>=3.32.2nb9 9BUILDLINK_ABI_DEPENDS.gtkhtml314+= gtkhtml314>=3.32.2nb9
10BUILDLINK_PKGSRCDIR.gtkhtml314?= ../../www/gtkhtml314 10BUILDLINK_PKGSRCDIR.gtkhtml314?= ../../www/gtkhtml314
11 11
12.include "../../devel/GConf/buildlink3.mk" 12.include "../../devel/GConf/buildlink3.mk"
13.include "../../textproc/enchant/buildlink3.mk" 13.include "../../textproc/enchant2/buildlink3.mk"
14.include "../../textproc/iso-codes/buildlink3.mk" 14.include "../../textproc/iso-codes/buildlink3.mk"
15.endif # GTKHTML314_BUILDLINK3_MK 15.endif # GTKHTML314_BUILDLINK3_MK
16 16
17BUILDLINK_TREE+= -gtkhtml314 17BUILDLINK_TREE+= -gtkhtml314
cvs diff -r1.29 -r1.30 pkgsrc/www/gtkhtml314/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/gtkhtml314/Attic/distinfo 2015/11/04 02:46:54 1.29
+++ pkgsrc/www/gtkhtml314/Attic/distinfo 2018/11/27 20:32:06 1.30
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.29 2015/11/04 02:46:54 agc Exp $ 1$NetBSD: distinfo,v 1.30 2018/11/27 20:32:06 bsiegert Exp $
2 2
3SHA1 (gtkhtml-3.32.2.tar.bz2) = db8a943ddeec0b86766e671e8f8c427706dbcdd4 3SHA1 (gtkhtml-3.32.2.tar.bz2) = db8a943ddeec0b86766e671e8f8c427706dbcdd4
4RMD160 (gtkhtml-3.32.2.tar.bz2) = b71afbd07c658c2ec6ac285cc428ac1943d39e46 4RMD160 (gtkhtml-3.32.2.tar.bz2) = b71afbd07c658c2ec6ac285cc428ac1943d39e46
5SHA512 (gtkhtml-3.32.2.tar.bz2) = a641a6e2208ad9db9ab3c3dc4696cf010b70f64d302b6f889a275db396544570ee5c894835a18ea94699375d0e2fd91fd7414a0546ce5f62bcb6d603d331b1d5 5SHA512 (gtkhtml-3.32.2.tar.bz2) = a641a6e2208ad9db9ab3c3dc4696cf010b70f64d302b6f889a275db396544570ee5c894835a18ea94699375d0e2fd91fd7414a0546ce5f62bcb6d603d331b1d5
6Size (gtkhtml-3.32.2.tar.bz2) = 1217025 bytes 6Size (gtkhtml-3.32.2.tar.bz2) = 1217025 bytes
 7SHA1 (patch-components_editor_gtkhtml-spell-checker.c) = 4d10e8b18ec7ecb7db1105f91bd5eed996b6accc
File Added: pkgsrc/www/gtkhtml314/patches/Attic/patch-components_editor_gtkhtml-spell-checker.c
$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);
 }