Date: Tuesday, June 9, 2020 @ 16:57:22
Author: arojas
Revision: 388677
Add missing hunspell dependency (FS#66956)
Modified:
lyx/trunk/PKGBUILD
Deleted:
lyx/trunk/lyx-enchant2.patch
--------------------+
PKGBUILD | 4 ++--
lyx-enchant2.patch | 37 -------------------------------------
2 files changed, 2 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-09 16:03:55 UTC (rev 388676)
+++ PKGBUILD 2020-06-09 16:57:22 UTC (rev 388677)
@@ -3,11 +3,11 @@
pkgname=lyx
pkgver=2.3.5.1
-pkgrel=1
+pkgrel=2
pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
arch=('x86_64')
url="https://www.lyx.org";
-depends=('qt5-svg' 'texlive-core' 'python' 'imagemagick' 'enchant'
+depends=('qt5-svg' 'texlive-core' 'python' 'imagemagick' 'enchant' 'hunspell'
'libmythes' 'file' 'hicolor-icon-theme' 'desktop-file-utils')
makedepends=('boost')
optdepends=('rcs: built-in version control system'
Deleted: lyx-enchant2.patch
===================================================================
--- lyx-enchant2.patch 2020-06-09 16:03:55 UTC (rev 388676)
+++ lyx-enchant2.patch 2020-06-09 16:57:22 UTC (rev 388677)
@@ -1,37 +0,0 @@
-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();
- Speller m;
-
- try {
- LYXERR(Debug::FILES, "request enchant speller for language " <<
lang);
-- m.speller = instance->request_dict(lang);
-+ m.speller = instance.request_dict(lang);
- }
- catch (enchant::Exception & e) {
- // FIXME error handling?
-@@ -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()));
-+ return (d->instance.dict_exists(lang->code()));
- }
-
-
