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

[Jan de Groot]

    Date: Sunday, January 21, 2018 @ 21:59:58
  Author: jgc
Revision: 284801

upgpkg: geany-plugins 1.32-3

Extend patch for enchant-2 library rename

Modified:
  geany-plugins/trunk/PKGBUILD
  geany-plugins/trunk/enchant-2.patch

-----------------+
 PKGBUILD        |    5 +++--
 enchant-2.patch |   16 ++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-21 21:05:25 UTC (rev 284800)
+++ PKGBUILD	2018-01-21 21:59:58 UTC (rev 284801)
@@ -6,7 +6,7 @@
 
 pkgname=geany-plugins
 pkgver=1.32
-pkgrel=2
+pkgrel=3
 pkgdesc='Plugins for Geany'
 arch=('x86_64')
 url='https://plugins.geany.org/'
@@ -17,11 +17,12 @@
 source=("https://plugins.geany.org/$pkgname/$pkgname-$pkgver.tar.bz2"
         enchant-2.patch)
 sha256sums=('78d4b394fe22fda298e80a22616421efdd4a419eb227b99eadca73f65abac117'
-            '99f160f002544550294f36366e3037ec2fe9c91efb9365c106a31a46cda6efb0')
+            '094a613b600e42de9b23c3586abf25f3b0695eb62ca2d341e82c0a5633fefeb8')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../enchant-2.patch
+  autoreconf -fi
 }
 
 build() {

Modified: enchant-2.patch
===================================================================
--- enchant-2.patch	2018-01-21 21:05:25 UTC (rev 284800)
+++ enchant-2.patch	2018-01-21 21:59:58 UTC (rev 284801)
@@ -34,3 +34,19 @@
  	create_dicts_array();
  
  	/* Check if the stored default dictionary is (still) available, fall back to the first
+--- geany-plugins-1.32/build/spellcheck.m4.orig	2017-07-16 19:00:27.000000000 +0000
++++ geany-plugins-1.32/build/spellcheck.m4	2018-01-21 21:56:47.533646705 +0000
+@@ -4,11 +4,11 @@
+ 
+     ENCHANT_VERSION=1.3
+     OPT_ENCHANT_VERSION=1.5
+-    PKG_CHECK_MODULES([ENCHANT], [enchant >= ${OPT_ENCHANT_VERSION}],
++    PKG_CHECK_MODULES([ENCHANT], [enchant-2 >= ${OPT_ENCHANT_VERSION}],
+                       have_enchant_1_5=yes,
+                       have_enchant_1_5=no)
+     GP_CHECK_PLUGIN_DEPS([spellcheck], [ENCHANT],
+-                         [enchant >= ${ENCHANT_VERSION}])
++                         [enchant-2 >= ${ENCHANT_VERSION}])
+ 
+     AM_CONDITIONAL([HAVE_ENCHANT_1_5], [test "$have_enchant_1_5" = yes])
+     GP_COMMIT_PLUGIN_STATUS([Spellcheck])