From 544d0c9b73f7a8bf2bb13a3b0ad87994478b9e3a Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Thu, 18 May 2017 00:02:31 +0100
Subject: [PATCH] lyx: update to 2.2.3

---
 lyx/PKGBUILD   | 17 +++++------------
 lyx/qt58.patch | 33 ---------------------------------
 2 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100644 lyx/qt58.patch

diff --git a/lyx/PKGBUILD b/lyx/PKGBUILD
index e4dade10d..84821882b 100644
--- a/lyx/PKGBUILD
+++ b/lyx/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=lyx
-pkgver=2.2.2
-pkgrel=3
+pkgver=2.2.3
+pkgrel=1
 pkgdesc="An advanced open-source document processor"
 arch=('x86_64')
 url="http://www.lyx.org"
@@ -12,17 +12,10 @@ optdepends=('texlive-most: TeX Live goodies'
 license=('GPL')
 source=("ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/$pkgname-$pkgver.tar.xz"
         'lyx.desktop'
-        'lyxrc.dist'
-        qt58.patch)
-md5sums=('c37b2926d7df211c94b7260e163e2c29'
+        'lyxrc.dist')
+md5sums=('032147bf8e05040787b0fca43fd70de3'
          '3827d343670a38d97bdc7e002ff1e4a1'
-         'b70fdeab95ba4a6c3ff72410dfa61823'
-         '9761360820f7bf292740013f2267f733')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ../qt58.patch
-}
+         'b70fdeab95ba4a6c3ff72410dfa61823')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/lyx/qt58.patch b/lyx/qt58.patch
deleted file mode 100644
index ebf916fc8..000000000
--- a/lyx/qt58.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6d375ddeac49ac8c6340398c9797354edca3f5d1 Mon Sep 17 00:00:00 2001
-From: Guillaume Munch <gm@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
-