[arch-commits] Commit in lyx/trunk (PKGBUILD lyx-enchant2.patch)

[Antonio Rojas]

    Date: Friday, November 24, 2017 @ 14:22:43
  Author: arojas
Revision: 310806

Fixup enchant 2 support

Modified:
  lyx/trunk/PKGBUILD
  lyx/trunk/lyx-enchant2.patch

--------------------+
 PKGBUILD           |    4 ++--
 lyx-enchant2.patch |   23 ++++++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-24 13:05:04 UTC (rev 310805)
+++ PKGBUILD	2017-11-24 14:22:43 UTC (rev 310806)
@@ -4,7 +4,7 @@
 
 pkgname=lyx
 pkgver=2.2.3
-pkgrel=4
+pkgrel=5
 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
 arch=('x86_64')
 url="http://www.lyx.org"
@@ -20,7 +20,7 @@
         lyxrc.dist lyx-enchant2.patch)
 sha1sums=('8c9946ab8ee762f1e21467dbf066f0adef6261d1'
           '56416642cc3da2a13b87b84e6b87c1a239f3d09a'
-          '035d6e7d5c1e83a62e426f99558089edbede0053')
+          '706c34e1a0b43cb01c6802cb85f65599dd0a3d18')
 
 prepare() {
   cd $pkgname-$pkgver

Modified: lyx-enchant2.patch
===================================================================
--- lyx-enchant2.patch	2017-11-24 13:05:04 UTC (rev 310805)
+++ lyx-enchant2.patch	2017-11-24 14:22:43 UTC (rev 310806)
@@ -1,11 +1,21 @@
---- lyx-2.2.3/src/EnchantChecker.cpp.orig	2017-11-23 11:19:54.636524228 +0000
-+++ lyx-2.2.3/src/EnchantChecker.cpp	2017-11-23 11:21:06.583432311 +0000
-@@ -68,12 +68,12 @@
+diff --git a/lyx-2.2.3/src/EnchantChecker.cpp.orig b/lyx-2.2.3/src/EnchantChecker.cpp
+index 7be361a..70d9914 100644
+--- lyx-2.2.3/src/EnchantChecker.cpp.orig
++++ lyx-2.2.3/src/EnchantChecker.cpp
+@@ -53,6 +53,8 @@ struct EnchantChecker::Private
  
+ 	/// the spellers
+ 	Spellers spellers_;
++
++	enchant::Broker instance;
+ };
+ 
+ 
+@@ -68,12 +70,11 @@ EnchantChecker::Private::~Private()
+ 
  enchant::Dict * EnchantChecker::Private::addSpeller(string const & lang)
  {
 -	enchant::Broker * instance = enchant::Broker::instance();
-+	enchant::Broker instance;
  	Speller m;
  
  	try {
@@ -15,14 +25,13 @@
  	}
  	catch (enchant::Exception & e) {
  		// FIXME error handling?
-@@ -186,8 +186,8 @@
+@@ -186,8 +187,7 @@ bool EnchantChecker::hasDictionary(Language const * lang) const
  {
  	if (!lang)
  		return false;
 -	enchant::Broker * instance = enchant::Broker::instance();
 -	return (instance->dict_exists(lang->code()));
-+	enchant::Broker instance;
-+	return (instance.dict_exists(lang->code()));
++	return (d->instance.dict_exists(lang->code()));
  }