[arch-commits] Commit in gtkspell/trunk (PKGBUILD enchant-2.diff enchant-2.patch)

[Jan Steffens]

    Date: Thursday, January 18, 2018 @ 11:48:56
  Author: heftig
Revision: 315074

2.0.16-7: enchant 2.2

Added:
  gtkspell/trunk/enchant-2.diff
    (from rev 315073, gtkspell/trunk/enchant-2.patch)
Modified:
  gtkspell/trunk/PKGBUILD
Deleted:
  gtkspell/trunk/enchant-2.patch

-----------------+
 PKGBUILD        |   13 ++++++++-----
 enchant-2.diff  |   30 ++++++++++++++++++++++++++++++
 enchant-2.patch |   11 -----------
 3 files changed, 38 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-18 11:41:18 UTC (rev 315073)
+++ PKGBUILD	2018-01-18 11:48:56 UTC (rev 315074)
@@ -4,7 +4,7 @@
 
 pkgname=gtkspell
 pkgver=2.0.16
-pkgrel=6
+pkgrel=7
 url="http://gtkspell.sourceforge.net/"
 pkgdesc="Provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget"
 arch=('x86_64')
@@ -13,16 +13,19 @@
 makedepends=('intltool' 'gtk-doc')
 validpgpkeys=('7C70E4D9927061BD840E82DB6BA6197569B23319') #Daniel Atallah <daniel.atallah at gmail.com>
 source=(https://downloads.sourceforge.net/sourceforge/gtkspell/${pkgname}-${pkgver}.tar.gz{,.asc}
-        enchant-2.patch)
+        enchant-2.diff)
 sha256sums=('8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02'
             'SKIP'
-            'edeecf8e1cb9c524fdf800026c2b9c91c60faba637185302167909dd234453e9')
+            '52e693590161bc285ec46a2beece802f47c7ede65ec0b72ffa224ab0db176bad')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../enchant-2.patch
+
+  # enchant 2.2
+  patch -Np1 -i ../enchant-2.diff
+
   gtkdocize
-  autoreconf -fi
+  autoreconf -fvi
 }
 
 build() {

Copied: gtkspell/trunk/enchant-2.diff (from rev 315073, gtkspell/trunk/enchant-2.patch)
===================================================================
--- enchant-2.diff	                        (rev 0)
+++ enchant-2.diff	2018-01-18 11:48:56 UTC (rev 315074)
@@ -0,0 +1,30 @@
+diff -u -r gtkspell-2.0.16/configure.ac gtkspell-2.0.16-enchant2/configure.ac
+--- gtkspell-2.0.16/configure.ac	2009-10-23 04:52:31.000000000 +0200
++++ gtkspell-2.0.16-enchant2/configure.ac	2018-01-18 12:42:06.366410232 +0100
+@@ -12,12 +12,12 @@
+ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+ AC_CONFIG_HEADERS([config.h])
+ 
+-SPELLER_LIB=-lenchant
++SPELLER_LIB=-lenchant-2
+       
+ AC_SUBST(SPELLER_LIB)
+ GTKSPELL_PACKAGES=gtk+-2.0
+ AC_SUBST(GTKSPELL_PACKAGES)
+-PKG_CHECK_MODULES(GTKSPELL, $GTKSPELL_PACKAGES enchant >= 0.4.0 )
++PKG_CHECK_MODULES(GTKSPELL, $GTKSPELL_PACKAGES enchant-2 >= 2.2.0 )
+ AC_SUBST(GTKSPELL_CFLAGS)
+ AC_SUBST(GTKSPELL_LIBS)
+ 
+diff -u -r gtkspell-2.0.16/gtkspell/gtkspell.c gtkspell-2.0.16-enchant2/gtkspell/gtkspell.c
+--- gtkspell-2.0.16/gtkspell/gtkspell.c	2009-10-09 21:01:47.000000000 +0200
++++ gtkspell-2.0.16-enchant2/gtkspell/gtkspell.c	2018-01-18 12:41:37.146338802 +0100
+@@ -277,7 +277,7 @@
+ 	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);
+ 

Deleted: enchant-2.patch
===================================================================
--- enchant-2.patch	2018-01-18 11:41:18 UTC (rev 315073)
+++ enchant-2.patch	2018-01-18 11:48:56 UTC (rev 315074)
@@ -1,11 +0,0 @@
---- gtkspell-2.0.16/gtkspell/gtkspell.c.orig	2009-10-09 19:01:47.000000000 +0000
-+++ gtkspell-2.0.16/gtkspell/gtkspell.c	2017-11-22 12:02:07.638601094 +0000
-@@ -277,7 +277,7 @@
- 	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);
-