[arch-commits] Commit in lyx/repos/extra-x86_64 (6 files)

Antonio Rojas arojas at archlinux.org
Sat Jun 29 08:49:29 UTC 2019


    Date: Saturday, June 29, 2019 @ 08:49:29
  Author: arojas
Revision: 357042

archrelease: copy trunk to extra-x86_64

Added:
  lyx/repos/extra-x86_64/PKGBUILD
    (from rev 357041, lyx/trunk/PKGBUILD)
  lyx/repos/extra-x86_64/lyx-enchant2.patch
    (from rev 357041, lyx/trunk/lyx-enchant2.patch)
  lyx/repos/extra-x86_64/lyxrc.dist
    (from rev 357041, lyx/trunk/lyxrc.dist)
Deleted:
  lyx/repos/extra-x86_64/PKGBUILD
  lyx/repos/extra-x86_64/lyx-enchant2.patch
  lyx/repos/extra-x86_64/lyxrc.dist

--------------------+
 PKGBUILD           |   92 +++++++++++++++++++++++++--------------------------
 lyx-enchant2.patch |   74 ++++++++++++++++++++---------------------
 lyxrc.dist         |   28 +++++++--------
 3 files changed, 97 insertions(+), 97 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-29 08:49:05 UTC (rev 357041)
+++ PKGBUILD	2019-06-29 08:49:29 UTC (rev 357042)
@@ -1,46 +0,0 @@
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Jason Chu <jason at archlinux.org>
-
-pkgname=lyx
-pkgver=2.3.2
-pkgrel=1
-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' 'desktop-file-utils')
-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=('f1a80fc7d0c69e5a28145275dd4f88d2a93bad1033b0cffe953f668fbbe4956c'
-            '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/extra-x86_64/PKGBUILD (from rev 357041, lyx/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-06-29 08:49:29 UTC (rev 357042)
@@ -0,0 +1,46 @@
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Jason Chu <jason at archlinux.org>
+
+pkgname=lyx
+pkgver=2.3.3
+pkgrel=1
+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'
+         'libmythes' 'file' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('boost')
+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=(https://ftp.lip6.fr/pub/lyx/stable/2.3.x/lyx-$pkgver.tar.gz{,.sig}
+        lyxrc.dist)
+validpgpkeys=('FE66471B43559707AFDAD955DE7A44FAC7FB382D')  # LyX Release Manager
+sha256sums=('ec8027a0ee8d4d35d2d02e9c8edefb0e873e09347fbc11f6734cebca998d7d48'
+            '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"
+}

Deleted: lyx-enchant2.patch
===================================================================
--- lyx-enchant2.patch	2019-06-29 08:49:05 UTC (rev 357041)
+++ lyx-enchant2.patch	2019-06-29 08:49:29 UTC (rev 357042)
@@ -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()));
- }
- 
- 

Copied: lyx/repos/extra-x86_64/lyx-enchant2.patch (from rev 357041, lyx/trunk/lyx-enchant2.patch)
===================================================================
--- lyx-enchant2.patch	                        (rev 0)
+++ lyx-enchant2.patch	2019-06-29 08:49:29 UTC (rev 357042)
@@ -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()));
+ }
+ 
+ 

Deleted: lyxrc.dist
===================================================================
--- lyxrc.dist	2019-06-29 08:49:05 UTC (rev 357041)
+++ lyxrc.dist	2019-06-29 08:49:29 UTC (rev 357042)
@@ -1,14 +0,0 @@
-### 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"

Copied: lyx/repos/extra-x86_64/lyxrc.dist (from rev 357041, lyx/trunk/lyxrc.dist)
===================================================================
--- lyxrc.dist	                        (rev 0)
+++ lyxrc.dist	2019-06-29 08:49:29 UTC (rev 357042)
@@ -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