[arch-commits] Commit in lyx/repos (4 files)
Antonio Rojas
arojas at archlinux.org
Thu Nov 23 11:55:23 UTC 2017
Date: Thursday, November 23, 2017 @ 11:55:22
Author: arojas
Revision: 310728
archrelease: copy trunk to staging-x86_64
Added:
lyx/repos/staging-x86_64/
lyx/repos/staging-x86_64/PKGBUILD
(from rev 310727, lyx/trunk/PKGBUILD)
lyx/repos/staging-x86_64/lyx-enchant2.patch
(from rev 310727, lyx/trunk/lyx-enchant2.patch)
lyx/repos/staging-x86_64/lyxrc.dist
(from rev 310727, lyx/trunk/lyxrc.dist)
--------------------+
PKGBUILD | 45 +++++++++++++++++++++++++++++++++++++++++++++
lyx-enchant2.patch | 28 ++++++++++++++++++++++++++++
lyxrc.dist | 14 ++++++++++++++
3 files changed, 87 insertions(+)
Copied: lyx/repos/staging-x86_64/PKGBUILD (from rev 310727, lyx/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2017-11-23 11:55:22 UTC (rev 310728)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Jason Chu <jason at archlinux.org>
+
+pkgname=lyx
+pkgver=2.2.3
+pkgrel=4
+pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
+arch=('x86_64')
+url="http://www.lyx.org"
+depends=('qt5-svg' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes' 'file'
+ 'hicolor-icon-theme')
+makedepends=('boost' 'bc')
+optdepends=('rcs: built-in version control system'
+ 'texlive-latexextra: float wrap support')
+license=('GPL')
+backup=('etc/lyx/lyxrc.dist')
+options=('emptydirs')
+source=(ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/$pkgname-$pkgver.tar.xz
+ lyxrc.dist lyx-enchant2.patch)
+sha1sums=('8c9946ab8ee762f1e21467dbf066f0adef6261d1'
+ '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"
+ ./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 310727, lyx/trunk/lyx-enchant2.patch)
===================================================================
--- staging-x86_64/lyx-enchant2.patch (rev 0)
+++ staging-x86_64/lyx-enchant2.patch 2017-11-23 11:55:22 UTC (rev 310728)
@@ -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()));
+ }
+
+
Copied: lyx/repos/staging-x86_64/lyxrc.dist (from rev 310727, lyx/trunk/lyxrc.dist)
===================================================================
--- staging-x86_64/lyxrc.dist (rev 0)
+++ staging-x86_64/lyxrc.dist 2017-11-23 11:55:22 UTC (rev 310728)
@@ -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"
More information about the arch-commits
mailing list