1.14-4

* drop qt-assistant from deplist
* change qwt5 patch to another one since it is possible that original
one can cause crash

3 files changed, 6 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b017fc30d6b3..714867e3f8d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Nov 30 17:41:42 UTC 2016
+# Mon Dec  5 10:53:17 UTC 2016
 pkgbase = scidavis
 	pkgdesc = Application for Scientific Data Analysis and Visualization, fork of QtiPlot
 	pkgver = 1.14
-	pkgrel = 3
+	pkgrel = 4
 	url = http://scidavis.sourceforge.net/
 	install = scidavis.install
 	arch = i686
@@ -17,12 +17,11 @@ pkgbase = scidavis
 	depends = muparser
 	depends = python2-pyqt4
 	depends = shared-mime-info
-	depends = qt-assistant-compat
 	depends = qwt5
 	depends = qwtplot3d
 	source = http://prdownloads.sourceforge.net/sourceforge/scidavis/scidavis-1.14.tar.gz
 	source = https://sourceforge.net/p/scidavis/scidavis-bugs/_discuss/thread/e0094938/8b60/attachment/fix_wrong_values_on_parameters_errors.patch
-	source = scidavis-qwt5.patch
+	source = https://sourceforge.net/p/scidavis/scidavis-bugs/_discuss/thread/fa133ad9/b8d8/attachment/scidavis-qwt5.patch
 	md5sums = 6b5fd39c17ed67cd64c77ac214099b2e
 	md5sums = 89247212a4fdaa34894a6562fa2b2457
 	md5sums = 28877fda6842869aa07d0bec50c49fa5
diff --git a/PKGBUILD b/PKGBUILD
index 6e9ef8a40af3..9be59699ae34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,17 +6,17 @@
 
 pkgname=scidavis
 pkgver=1.14
-pkgrel=3
+pkgrel=4
 pkgdesc="Application for Scientific Data Analysis and Visualization, fork of QtiPlot"
 arch=('i686' 'x86_64')
 url="http://scidavis.sourceforge.net/"
 license=('GPL')
 makedepends=('boost' 'cmake')
 depends=('gsl' 'glu' 'mesa' 'muparser' 'python2-pyqt4' 'shared-mime-info'
-         'qt-assistant-compat' 'qwt5' 'qwtplot3d')
+         'qwt5' 'qwtplot3d')
 source=("http://prdownloads.sourceforge.net/sourceforge/scidavis/${pkgname}-${pkgver}.tar.gz"
         "https://sourceforge.net/p/scidavis/scidavis-bugs/_discuss/thread/e0094938/8b60/attachment/fix_wrong_values_on_parameters_errors.patch"
-        "scidavis-qwt5.patch")
+        "https://sourceforge.net/p/scidavis/scidavis-bugs/_discuss/thread/fa133ad9/b8d8/attachment/scidavis-qwt5.patch")
 md5sums=('6b5fd39c17ed67cd64c77ac214099b2e'
          '89247212a4fdaa34894a6562fa2b2457'
          '28877fda6842869aa07d0bec50c49fa5')
diff --git a/scidavis-qwt5.patch b/scidavis-qwt5.patch
deleted file mode 100644
index 50a5e505c8a5..000000000000
--- a/scidavis-qwt5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN scidavis-1.14.orig/config.pri scidavis-1.14/config.pri
---- scidavis-1.14.orig/config.pri	2016-07-04 13:34:25.366655195 +0300
-+++ scidavis-1.14/config.pri	2016-07-04 13:35:36.194158360 +0300
-@@ -295,7 +295,7 @@
- 	INCLUDEPATH  += /usr/include/qwtplot3d
- 	LIBS         += -lqwtplot3d$${qwtsuff}
- 
--	LIBS         += -lz -lGLU 
-+	LIBS         += -lz -lGLU -lqwt5
- 
- 	INCLUDEPATH  += /usr/include/muParser
- 	LIBS         += -lgsl -lgslcblas