[arch-commits] Commit in lyx/repos (4 files)

[Evangelos Foutras]

    Date: Saturday, November 17, 2018 @ 17:38:59
  Author: foutrelis
Revision: 340048

archrelease: copy trunk to staging-x86_64

Added:
  lyx/repos/staging-x86_64/
  lyx/repos/staging-x86_64/PKGBUILD
    (from rev 340047, lyx/trunk/PKGBUILD)
  lyx/repos/staging-x86_64/lyx-enchant2.patch
    (from rev 340047, lyx/trunk/lyx-enchant2.patch)
  lyx/repos/staging-x86_64/lyxrc.dist
    (from rev 340047, lyx/trunk/lyxrc.dist)

--------------------+
 PKGBUILD           |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 lyx-enchant2.patch |   37 +++++++++++++++++++++++++++++++++++++
 lyxrc.dist         |   14 ++++++++++++++
 3 files changed, 98 insertions(+)

Copied: lyx/repos/staging-x86_64/PKGBUILD (from rev 340047, lyx/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2018-11-17 17:38:59 UTC (rev 340048)
@@ -0,0 +1,47 @@
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Jason Chu <jason at archlinux.org>
+
+pkgname=lyx
+pkgver=2.3.1
+_pkgver='2.3.1-2'
+pkgrel=2
+pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
+arch=('x86_64')
+url="http://www.lyx.org"
+depends=('qt5-svg' 'texlive-core' 'python' 'imagemagick' 'enchant' 'boost-libs'
+         'libmythes' 'file' 'hicolor-icon-theme')
+makedepends=('boost' 'bc')
+optdepends=('rcs: built-in version control system'
+            'texlive-latexextra: float wrap support'
+            'python: support for python scripts')
+license=('GPL')
+backup=('etc/lyx/lyxrc.dist')
+options=('emptydirs')
+source=(ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/$pkgname-$_pkgver.tar.xz{,.sig}
+        lyxrc.dist)
+validpgpkeys=('FE66471B43559707AFDAD955DE7A44FAC7FB382D')  # LyX Release Manager
+sha256sums=('f5c9450ba196ed9d49fbc573f65b10d1726d16a62453466957aba2a9f6d66f84'
+            'SKIP'
+            '7748beb9a821ce06342487e4a60bf4bf632fe2874e187ea54ed654dc6a9ef21e')
+
+prepare() {
+  cd $pkgname-$pkgver
+  autoreconf -vi
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  export CXXFLAGS="$CXXFLAGS -fpermissive"
+  ./configure --prefix=/usr \
+    --enable-qt5 --without-included-boost \
+    --without-included-mythes
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  # install default config file
+  install -Dm644 "${srcdir}/lyxrc.dist" "${pkgdir}/etc/lyx/lyxrc.dist"
+  ln -sf /etc/lyx/lyxrc.dist "${pkgdir}/usr/share/lyx/lyxrc.dist"
+}

Copied: lyx/repos/staging-x86_64/lyx-enchant2.patch (from rev 340047, lyx/trunk/lyx-enchant2.patch)
===================================================================
--- staging-x86_64/lyx-enchant2.patch	                        (rev 0)
+++ staging-x86_64/lyx-enchant2.patch	2018-11-17 17:38:59 UTC (rev 340048)
@@ -0,0 +1,37 @@
+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()));
+ }
+ 
+ 

Copied: lyx/repos/staging-x86_64/lyxrc.dist (from rev 340047, lyx/trunk/lyxrc.dist)
===================================================================
--- staging-x86_64/lyxrc.dist	                        (rev 0)
+++ staging-x86_64/lyxrc.dist	2018-11-17 17:38:59 UTC (rev 340048)
@@ -0,0 +1,14 @@
+### This file is part of
+### ========================================================
+###          LyX, The Document Processor
+###
+###          Copyright 1995 Matthias Ettrich
+###          Copyright 1995-2011 The LyX Team.
+###
+### ========================================================
+
+# The file lyxrc.dist gives initial global options for all LyX users.
+# Almost all settings here can be overridden through the preferences in LyX.
+
+\thesaurusdir_path "/usr/share/mythes"
+\hunspelldir_path "/usr/share/myspell"