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

[Jan de Groot]

    Date: Thursday, November 23, 2017 @ 09:29:33
  Author: jgc
Revision: 268182

upgpkg: geany-plugins 1.32-2

enchant rebuild

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

-----------------+
 PKGBUILD        |   14 +++++++++++---
 enchant-2.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-23 09:25:45 UTC (rev 268181)
+++ PKGBUILD	2017-11-23 09:29:33 UTC (rev 268182)
@@ -6,7 +6,7 @@
 
 pkgname=geany-plugins
 pkgver=1.32
-pkgrel=1
+pkgrel=2
 pkgdesc='Plugins for Geany'
 arch=('x86_64')
 url='https://plugins.geany.org/'
@@ -14,9 +14,16 @@
 depends=("geany>=$pkgver" 'ctpl' 'desktop-file-utils' 'gpgme' 'gtkspell' 'libgit2' 'lua51' 'pygtk' 'python2' 'vte')
 makedepends=('cppcheck' 'gdb' 'intltool' 'libgit2' 'vala')
 optdepends=('hspell: hebrew spell checker')
-source=("https://plugins.geany.org/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha256sums=('78d4b394fe22fda298e80a22616421efdd4a419eb227b99eadca73f65abac117')
+source=("https://plugins.geany.org/$pkgname/$pkgname-$pkgver.tar.bz2"
+        enchant-2.patch)
+sha256sums=('78d4b394fe22fda298e80a22616421efdd4a419eb227b99eadca73f65abac117'
+            '99f160f002544550294f36366e3037ec2fe9c91efb9365c106a31a46cda6efb0')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../enchant-2.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"
 
@@ -24,6 +31,7 @@
   export PYTHON=/usr/bin/python2
 
   ./configure --prefix=/usr --libexecdir=/usr/lib
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 

Added: enchant-2.patch
===================================================================
--- enchant-2.patch	                        (rev 0)
+++ enchant-2.patch	2017-11-23 09:29:33 UTC (rev 268182)
@@ -0,0 +1,36 @@
+--- geany-plugins-1.32/spellcheck/src/speller.c.orig	2017-10-17 04:58:25.000000000 +0000
++++ geany-plugins-1.32/spellcheck/src/speller.c	2017-11-23 09:20:27.280196692 +0000
+@@ -470,7 +470,7 @@
+ 	g_return_if_fail(sc_speller_dict != NULL);
+ 	g_return_if_fail(word != NULL);
+ 
+-	enchant_dict_add_to_pwl(sc_speller_dict, word, -1);
++	enchant_dict_add(sc_speller_dict, word, -1);
+ }
+ 
+ gboolean sc_speller_dict_check(const gchar *word)
+@@ -518,24 +518,6 @@
+ 	if (sc_speller_dict != NULL)
+ 		enchant_broker_free_dict(sc_speller_broker, sc_speller_dict);
+ 
+-#if HAVE_ENCHANT_1_5
+-	{
+-		const gchar *old_path;
+-		gchar *new_path;
+-
+-		/* add custom dictionary path for myspell (primarily used on Windows) */
+-		old_path = enchant_broker_get_param(sc_speller_broker, "enchant.myspell.dictionary.path");
+-		if (old_path != NULL)
+-			new_path = g_strconcat(
+-				old_path, G_SEARCHPATH_SEPARATOR_S, sc_info->dictionary_dir, NULL);
+-		else
+-			new_path = sc_info->dictionary_dir;
+-
+-		enchant_broker_set_param(sc_speller_broker, "enchant.myspell.dictionary.path", new_path);
+-		if (new_path != sc_info->dictionary_dir)
+-			g_free(new_path);
+-	}
+-#endif
+ 	create_dicts_array();
+ 
+ 	/* Check if the stored default dictionary is (still) available, fall back to the first