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

Evangelos Foutras foutrelis at archlinux.org
Wed Apr 26 15:28:27 UTC 2017


    Date: Wednesday, April 26, 2017 @ 15:28:26
  Author: foutrelis
Revision: 294766

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  lyx/repos/staging-i686/
  lyx/repos/staging-i686/PKGBUILD
    (from rev 294765, lyx/trunk/PKGBUILD)
  lyx/repos/staging-i686/lyxrc.dist
    (from rev 294765, lyx/trunk/lyxrc.dist)
  lyx/repos/staging-i686/qt58.patch
    (from rev 294765, lyx/trunk/qt58.patch)
  lyx/repos/staging-x86_64/
  lyx/repos/staging-x86_64/PKGBUILD
    (from rev 294765, lyx/trunk/PKGBUILD)
  lyx/repos/staging-x86_64/lyxrc.dist
    (from rev 294765, lyx/trunk/lyxrc.dist)
  lyx/repos/staging-x86_64/qt58.patch
    (from rev 294765, lyx/trunk/qt58.patch)

---------------------------+
 staging-i686/PKGBUILD     |   46 ++++++++++++++++++++++++++++++++++++++++++++
 staging-i686/lyxrc.dist   |   14 +++++++++++++
 staging-i686/qt58.patch   |   33 +++++++++++++++++++++++++++++++
 staging-x86_64/PKGBUILD   |   46 ++++++++++++++++++++++++++++++++++++++++++++
 staging-x86_64/lyxrc.dist |   14 +++++++++++++
 staging-x86_64/qt58.patch |   33 +++++++++++++++++++++++++++++++
 6 files changed, 186 insertions(+)

Copied: lyx/repos/staging-i686/PKGBUILD (from rev 294765, lyx/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2017-04-26 15:28:26 UTC (rev 294766)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Jason Chu <jason at archlinux.org>
+
+pkgname=lyx
+pkgver=2.2.2
+pkgrel=4
+pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
+arch=('i686' '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
+        qt58.patch
+        lyxrc.dist)
+sha1sums=('30f6f24f81a8990261b1dfd9a6196dfe1459abda'
+          'df07c31590afb7004cfd47a93064f172a5bc8f42'
+          '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../qt58.patch
+}
+
+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-i686/lyxrc.dist (from rev 294765, lyx/trunk/lyxrc.dist)
===================================================================
--- staging-i686/lyxrc.dist	                        (rev 0)
+++ staging-i686/lyxrc.dist	2017-04-26 15:28:26 UTC (rev 294766)
@@ -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"

Copied: lyx/repos/staging-i686/qt58.patch (from rev 294765, lyx/trunk/qt58.patch)
===================================================================
--- staging-i686/qt58.patch	                        (rev 0)
+++ staging-i686/qt58.patch	2017-04-26 15:28:26 UTC (rev 294766)
@@ -0,0 +1,33 @@
+From 6d375ddeac49ac8c6340398c9797354edca3f5d1 Mon Sep 17 00:00:00 2001
+From: Guillaume Munch <gm at lyx.org>
+Date: Tue, 20 Dec 2016 00:15:58 +0100
+Subject: [PATCH] Fix compilation with Qt5.8dev
+
+---
+ src/frontends/qt4/GuiViewSource.cpp |    9 ++-------
+ 1 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/src/frontends/qt4/GuiViewSource.cpp b/src/frontends/qt4/GuiViewSource.cpp
+index 9c0ea1d..fe59387 100644
+--- a/src/frontends/qt4/GuiViewSource.cpp
++++ b/src/frontends/qt4/GuiViewSource.cpp
+@@ -218,14 +218,9 @@ void ViewSourceWidget::updateView(BufferView const * bv)
+ 	if (changed && !texrow_) {
+ 		// position-to-row is unavailable
+ 		// we jump to the first modification
+-		const QChar * oc = old.constData();
+-		const QChar * nc = qcontent.constData();
++		int length = min(old.length(), qcontent.length());
+ 		int pos = 0;
+-		while (*oc != '\0' && *nc != '\0' && *oc == *nc) {
+-			++oc;
+-			++nc;
+-			++pos;
+-		}
++		for (; pos < length && old.at(pos) == qcontent.at(pos); ++pos) {}
+ 		QTextCursor c = QTextCursor(viewSourceTV->document());
+ 		//get some space below the cursor
+ 		c.setPosition(pos);
+-- 
+1.7.1
+

Copied: lyx/repos/staging-x86_64/PKGBUILD (from rev 294765, lyx/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2017-04-26 15:28:26 UTC (rev 294766)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Jason Chu <jason at archlinux.org>
+
+pkgname=lyx
+pkgver=2.2.2
+pkgrel=4
+pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
+arch=('i686' '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
+        qt58.patch
+        lyxrc.dist)
+sha1sums=('30f6f24f81a8990261b1dfd9a6196dfe1459abda'
+          'df07c31590afb7004cfd47a93064f172a5bc8f42'
+          '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../qt58.patch
+}
+
+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/lyxrc.dist (from rev 294765, lyx/trunk/lyxrc.dist)
===================================================================
--- staging-x86_64/lyxrc.dist	                        (rev 0)
+++ staging-x86_64/lyxrc.dist	2017-04-26 15:28:26 UTC (rev 294766)
@@ -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"

Copied: lyx/repos/staging-x86_64/qt58.patch (from rev 294765, lyx/trunk/qt58.patch)
===================================================================
--- staging-x86_64/qt58.patch	                        (rev 0)
+++ staging-x86_64/qt58.patch	2017-04-26 15:28:26 UTC (rev 294766)
@@ -0,0 +1,33 @@
+From 6d375ddeac49ac8c6340398c9797354edca3f5d1 Mon Sep 17 00:00:00 2001
+From: Guillaume Munch <gm at lyx.org>
+Date: Tue, 20 Dec 2016 00:15:58 +0100
+Subject: [PATCH] Fix compilation with Qt5.8dev
+
+---
+ src/frontends/qt4/GuiViewSource.cpp |    9 ++-------
+ 1 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/src/frontends/qt4/GuiViewSource.cpp b/src/frontends/qt4/GuiViewSource.cpp
+index 9c0ea1d..fe59387 100644
+--- a/src/frontends/qt4/GuiViewSource.cpp
++++ b/src/frontends/qt4/GuiViewSource.cpp
+@@ -218,14 +218,9 @@ void ViewSourceWidget::updateView(BufferView const * bv)
+ 	if (changed && !texrow_) {
+ 		// position-to-row is unavailable
+ 		// we jump to the first modification
+-		const QChar * oc = old.constData();
+-		const QChar * nc = qcontent.constData();
++		int length = min(old.length(), qcontent.length());
+ 		int pos = 0;
+-		while (*oc != '\0' && *nc != '\0' && *oc == *nc) {
+-			++oc;
+-			++nc;
+-			++pos;
+-		}
++		for (; pos < length && old.at(pos) == qcontent.at(pos); ++pos) {}
+ 		QTextCursor c = QTextCursor(viewSourceTV->document());
+ 		//get some space below the cursor
+ 		c.setPosition(pos);
+-- 
+1.7.1
+



More information about the arch-commits mailing list