From 6fdbec41d830ed325f3267fe656fd9012faa14af Mon Sep 17 00:00:00 2001
From: AlmAck <almack@chakralinux.org>
Date: Mon, 15 May 2017 23:41:19 +0100
Subject: [PATCH] rebuild against boost

---
 freecad/PKGBUILD    |  2 +-
 lyx/PKGBUILD        | 13 ++++++++++---
 lyx/qt58.patch      | 33 +++++++++++++++++++++++++++++++++
 mkvtoolnix/PKGBUILD |  2 +-
 4 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 lyx/qt58.patch

diff --git a/freecad/PKGBUILD b/freecad/PKGBUILD
index 232d4664d..c8231590b 100644
--- a/freecad/PKGBUILD
+++ b/freecad/PKGBUILD
@@ -1,7 +1,7 @@
 pkgname=freecad
 _pkgname=FreeCAD
 pkgver=0.16
-pkgrel=4
+pkgrel=5
 pkgdesc='A general purpose 3D CAD modeler'
 arch=('x86_64')
 url='http://www.freecadweb.org/wiki'
diff --git a/lyx/PKGBUILD b/lyx/PKGBUILD
index aa0d6c6b1..e4dade10d 100644
--- a/lyx/PKGBUILD
+++ b/lyx/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=lyx
 pkgver=2.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="An advanced open-source document processor"
 arch=('x86_64')
 url="http://www.lyx.org"
@@ -12,10 +12,17 @@ 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')
+        'lyxrc.dist'
+        qt58.patch)
 md5sums=('c37b2926d7df211c94b7260e163e2c29'
          '3827d343670a38d97bdc7e002ff1e4a1'
-         'b70fdeab95ba4a6c3ff72410dfa61823')
+         'b70fdeab95ba4a6c3ff72410dfa61823'
+         '9761360820f7bf292740013f2267f733')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../qt58.patch
+}
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/lyx/qt58.patch b/lyx/qt58.patch
new file mode 100644
index 000000000..ebf916fc8
--- /dev/null
+++ b/lyx/qt58.patch
@@ -0,0 +1,33 @@
+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
+
diff --git a/mkvtoolnix/PKGBUILD b/mkvtoolnix/PKGBUILD
index 8a05a7ef5..b59250ce9 100644
--- a/mkvtoolnix/PKGBUILD
+++ b/mkvtoolnix/PKGBUILD
@@ -1,7 +1,7 @@
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gui')
 pkgver=11.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Set of tools to create, edit and inspect Matroska files."
 arch=('x86_64')
 license=('GPL')