Date: Thursday, November 23, 2017 @ 11:53:24
Author: arojas
Revision: 310727
enchant 2.1 rebuild
Added:
lyx/trunk/lyx-enchant2.patch
Modified:
lyx/trunk/PKGBUILD
--------------------+
PKGBUILD | 12 +++++++++---
lyx-enchant2.patch | 28 ++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-11-23 07:34:18 UTC (rev 310726)
+++ PKGBUILD 2017-11-23 11:53:24 UTC (rev 310727)
@@ -4,7 +4,7 @@
pkgname=lyx
pkgver=2.2.3
-pkgrel=3
+pkgrel=4
pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
arch=('x86_64')
url="http://www.lyx.org";
@@ -17,10 +17,16 @@
backup=('etc/lyx/lyxrc.dist')
options=('emptydirs')
source=(ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/$pkgname-$pkgver.tar.xz
- lyxrc.dist)
+ lyxrc.dist lyx-enchant2.patch)
sha1sums=('8c9946ab8ee762f1e21467dbf066f0adef6261d1'
- '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
+ '56416642cc3da2a13b87b84e6b87c1a239f3d09a'
+ '035d6e7d5c1e83a62e426f99558089edbede0053')
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../lyx-enchant2.patch # Fix build with Enchant 2.x
+}
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
export CXXFLAGS="$CXXFLAGS -fpermissive"
Added: lyx-enchant2.patch
===================================================================
--- lyx-enchant2.patch (rev 0)
+++ lyx-enchant2.patch 2017-11-23 11:53:24 UTC (rev 310727)
@@ -0,0 +1,28 @@
+--- 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 @@
+
+ enchant::Dict * EnchantChecker::Private::addSpeller(string const & lang)
+ {
+- enchant::Broker * instance = 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 +186,8 @@
+ {
+ 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()));
+ }
+
+
