CVS commit: pkgsrc/textproc/gtkspell

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jul 13 15:41:27 UTC 2019

Modified Files:
        pkgsrc/textproc/gtkspell: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/textproc/gtkspell/patches: patch-configure
            patch-gtkspell_gtkspell.c

Log Message:
gtkspell: update to 2.0.16nb30.

Switch from enchant to enchant2.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/textproc/gtkspell/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/textproc/gtkspell/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/textproc/gtkspell/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/gtkspell/patches/patch-configure \
    pkgsrc/textproc/gtkspell/patches/patch-gtkspell_gtkspell.c

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

Modified files:

Index: pkgsrc/textproc/gtkspell/Makefile
diff -u pkgsrc/textproc/gtkspell/Makefile:1.69 pkgsrc/textproc/gtkspell/Makefile:1.70
--- pkgsrc/textproc/gtkspell/Makefile:1.69      Wed Nov 14 22:22:31 2018
+++ pkgsrc/textproc/gtkspell/Makefile   Sat Jul 13 15:41:27 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2018/11/14 22:22:31 kleink Exp $
+# $NetBSD: Makefile,v 1.70 2019/07/13 15:41:27 wiz Exp $
 
 DISTNAME=      gtkspell-2.0.16
-PKGREVISION=   29
+PKGREVISION=   30
 CATEGORIES=    textproc devel
 MASTER_SITES=  http://gtkspell.sourceforge.net/download/
 
@@ -18,6 +18,6 @@ PKGCONFIG_OVERRIDE=   gtkspell-2.0.pc.in
 CONFIGURE_ARGS+=       --disable-gtk-doc
 
 .include "../../devel/pango/buildlink3.mk"
-.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/enchant2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/gtkspell/buildlink3.mk
diff -u pkgsrc/textproc/gtkspell/buildlink3.mk:1.43 pkgsrc/textproc/gtkspell/buildlink3.mk:1.44
--- pkgsrc/textproc/gtkspell/buildlink3.mk:1.43 Wed Nov 14 22:22:31 2018
+++ pkgsrc/textproc/gtkspell/buildlink3.mk      Sat Jul 13 15:41:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.43 2018/11/14 22:22:31 kleink Exp $
+# $NetBSD: buildlink3.mk,v 1.44 2019/07/13 15:41:27 wiz Exp $
 
 BUILDLINK_TREE+=       gtkspell
 
@@ -6,10 +6,10 @@ BUILDLINK_TREE+=      gtkspell
 GTKSPELL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtkspell+=       gtkspell>=2.0.13
-BUILDLINK_ABI_DEPENDS.gtkspell+=       gtkspell>=2.0.16nb29
+BUILDLINK_ABI_DEPENDS.gtkspell+=       gtkspell>=2.0.16nb30
 BUILDLINK_PKGSRCDIR.gtkspell?=         ../../textproc/gtkspell
 
-.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/enchant2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .endif # GTKSPELL_BUILDLINK3_MK
 

Index: pkgsrc/textproc/gtkspell/distinfo
diff -u pkgsrc/textproc/gtkspell/distinfo:1.14 pkgsrc/textproc/gtkspell/distinfo:1.15
--- pkgsrc/textproc/gtkspell/distinfo:1.14      Wed Nov  4 01:59:30 2015
+++ pkgsrc/textproc/gtkspell/distinfo   Sat Jul 13 15:41:27 2019
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.14 2015/11/04 01:59:30 agc Exp $
+$NetBSD: distinfo,v 1.15 2019/07/13 15:41:27 wiz Exp $
 
 SHA1 (gtkspell-2.0.16.tar.gz) = 49a3eaff850d119a94fc929635270f01e87cdca1
 RMD160 (gtkspell-2.0.16.tar.gz) = 92c29780a43cd6fa2270d5ee77f9bc1ac09e56df
 SHA512 (gtkspell-2.0.16.tar.gz) = 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d
 Size (gtkspell-2.0.16.tar.gz) = 351277 bytes
+SHA1 (patch-configure) = f4f0859ad7ecd07f3df39784ea66e1586cf4ad74
+SHA1 (patch-gtkspell_gtkspell.c) = 1a75fa98d6e061dc938c7686a80524150be6df01

Added files:

Index: pkgsrc/textproc/gtkspell/patches/patch-configure
diff -u /dev/null pkgsrc/textproc/gtkspell/patches/patch-configure:1.1
--- /dev/null   Sat Jul 13 15:41:27 2019
+++ pkgsrc/textproc/gtkspell/patches/patch-configure    Sat Jul 13 15:41:27 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2019/07/13 15:41:27 wiz Exp $
+
+Adapt library name for enchant2.
+
+--- configure.orig     2009-10-23 02:57:15.000000000 +0000
++++ configure
+@@ -2584,7 +2584,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+ ac_config_headers="$ac_config_headers config.h"
+ 
+ 
+-SPELLER_LIB=-lenchant
++SPELLER_LIB=-lenchant-2
+ 
+ 
+ GTKSPELL_PACKAGES=gtk+-2.0
Index: pkgsrc/textproc/gtkspell/patches/patch-gtkspell_gtkspell.c
diff -u /dev/null pkgsrc/textproc/gtkspell/patches/patch-gtkspell_gtkspell.c:1.1
--- /dev/null   Sat Jul 13 15:41:27 2019
+++ pkgsrc/textproc/gtkspell/patches/patch-gtkspell_gtkspell.c  Sat Jul 13 15:41:27 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-gtkspell_gtkspell.c,v 1.1 2019/07/13 15:41:27 wiz Exp $
+
+Adapt for enchant2.
+
+--- gtkspell/gtkspell.c.orig   2009-10-09 19:01:47.000000000 +0000
++++ gtkspell/gtkspell.c
+@@ -277,7 +277,7 @@ add_to_dictionary(GtkWidget *menuitem, G
+       get_word_extents_from_mark(spell->buffer, &start, &end, spell->mark_click);
+       word = gtk_text_buffer_get_text(spell->buffer, &start, &end, FALSE);
+       
+-      enchant_dict_add_to_pwl( spell->speller, word, strlen(word));
++      enchant_dict_add( spell->speller, word, strlen(word));
+ 
+       gtkspell_recheck_all(spell);
+