From 06786b4c0b1e11b3a2bf6d4fcb04f866c97e4df5 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 1 Jun 2017 08:47:44 +0200
Subject: scidavis: 1.14-1 -> 1.14-2

---
 scidavis/.gitignore          |  1 +
 scidavis/PKGBUILD            | 22 +++++++++++++++-------
 scidavis/scidavis-qwt5.patch | 12 ------------
 3 files changed, 16 insertions(+), 19 deletions(-)
 create mode 100644 scidavis/.gitignore
 delete mode 100644 scidavis/scidavis-qwt5.patch

(limited to 'scidavis')

diff --git a/scidavis/.gitignore b/scidavis/.gitignore
new file mode 100644
index 00000000..1d45c0a4
--- /dev/null
+++ b/scidavis/.gitignore
@@ -0,0 +1 @@
+*.patch
diff --git a/scidavis/PKGBUILD b/scidavis/PKGBUILD
index c802c43e..8c39855b 100644
--- a/scidavis/PKGBUILD
+++ b/scidavis/PKGBUILD
@@ -7,21 +7,26 @@
 
 pkgname=scidavis
 pkgver=1.14
-pkgrel=1
+pkgrel=2
 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')
-source=(http://prdownloads.sourceforge.net/sourceforge/scidavis/${pkgname}-${pkgver}.tar.gz
-        scidavis-qwt5.patch)
+         '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"
+        "https://sourceforge.net/p/scidavis/scidavis-bugs/_discuss/thread/fa133ad9/b8d8/attachment/scidavis-qwt5.patch")
 md5sums=('6b5fd39c17ed67cd64c77ac214099b2e'
-         '28877fda6842869aa07d0bec50c49fa5')
-install=${pkgname}.install
+         '89247212a4fdaa34894a6562fa2b2457'
+         '4166c8637deb81bce31d5ee511586245')
+install="${pkgname}.install"
 
 prepare() {
+  # fix https://sourceforge.net/p/scidavis/scidavis-bugs/276/
+  patch -p0 -i "fix_wrong_values_on_parameters_errors.patch" "${pkgname}-${pkgver}/libscidavis/src/Fit.cpp"
+
   # fix qwt
   patch -p0 -i "scidavis-qwt5.patch"
 }
@@ -38,6 +43,9 @@ package() {
 
   # remove liborigin files since it uses static library
   rm -rf "${pkgdir}/usr/local"
-}
 
+  # install desktop file and icon
+  install -Dm644 "scidavis/scidavis.desktop" "${pkgdir}/usr/share/applications/scidavis.desktop"
+  install -Dm644 "scidavis/icons/scidavis.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/scidavis.svg"
+}
 
diff --git a/scidavis/scidavis-qwt5.patch b/scidavis/scidavis-qwt5.patch
deleted file mode 100644
index 50a5e505..00000000
--- a/scidavis/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
-- 
cgit v1.2.3-54-g00ecf