From 03628c371c9f2f449534a533de7956720a425ae8 Mon Sep 17 00:00:00 2001
From: arcan1s <esalexeev@gmail.com>
Date: Thu, 12 Sep 2013 23:00:46 +0400
Subject: [PATCH] scidavis-r9

---
 scidavis/PKGBUILD                  | 16 +++++++++-------
 scidavis/multipeakfit.h.patch      | 22 ++++++++++++++++++++++
 scidavis/qt-assistant-compat.patch |  6 +++---
 scidavis/scidavis.sip.patch        |  4 ++--
 4 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 scidavis/multipeakfit.h.patch

diff --git a/scidavis/PKGBUILD b/scidavis/PKGBUILD
index 5a2740a..f101d98 100644
--- a/scidavis/PKGBUILD
+++ b/scidavis/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=scidavis
 pkgver=0.2.4
-pkgrel=8
+pkgrel=9
 pkgdesc="Application for Scientific Data Analysis and Visualization, fork of QtiPlot"
 arch=('i686' 'x86_64')
 depends=('gsl' 'mesa' 'muparser' 'python2-pyqt4' 'shared-mime-info' 
@@ -13,6 +13,7 @@ depends=('gsl' 'mesa' 'muparser' 'python2-pyqt4' 'shared-mime-info'
 license=('GPL')
 url="http://scidavis.sourceforge.net/"
 source=(http://prdownloads.sourceforge.net/sourceforge/scidavis/${pkgname}-${pkgver}.tar.bz2
+        multipeakfit.h.patch
         scidavis.pro.patch
         scidavis.sip.patch
         scidavis-python2.patch
@@ -20,23 +21,26 @@ source=(http://prdownloads.sourceforge.net/sourceforge/scidavis/${pkgname}-${pkg
         qwt5.patch)
 install=${pkgname}.install
 md5sums=('c5650475c5e0b22f9ee5dc49630a0e89'
+         '59ac672f49e1e4e034bfdfb566b99589'
          '2ec36f34039ca8cd6db2401b1215590b'
-         'c140a5ce784f9e106fb637fcc3df517c'
+         'c17bf09fa34cc9a75675d95b1585147f'
          'ff0a7cb32e8ed439f008bfd114cbf611'
-         '450b7139f913210dd8a0ffbde03e86be'
+         '2fefdab0fa536098637e7250efcd727e'
          '159aad53f13328123d42bfb7a4adf1b8')
 
 prepare()
 {
   cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}
+  # fix private to public
+  patch -p0 < ${srcdir}/multipeakfit.h.patch
   # disable building self library
   patch < ${srcdir}/scidavis.pro.patch
   # fix bug http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655776
-  patch -p2 < ${srcdir}/scidavis.sip.patch
+  patch -p0 < ${srcdir}/scidavis.sip.patch
   # change python to python2
   patch < ${srcdir}/scidavis-python2.patch
   # fix path to QtAssistant header
-  patch -p2 < ${srcdir}/qt-assistant-compat.patch
+  patch -p0 < ${srcdir}/qt-assistant-compat.patch
   # change qwt to qwt5
   patch < ${srcdir}/qwt5.patch
 }
@@ -44,8 +48,6 @@ prepare()
 build()
 {
   cd ${srcdir}/${pkgname}-${pkgver}/
-  lupdate-qt4 scidavis.pro
-  lrelease-qt4 scidavis.pro
   qmake-qt4
   make || return 1
 }
diff --git a/scidavis/multipeakfit.h.patch b/scidavis/multipeakfit.h.patch
new file mode 100644
index 0000000..9c416a7
--- /dev/null
+++ b/scidavis/multipeakfit.h.patch
@@ -0,0 +1,22 @@
+--- src/MultiPeakFit.h.old	2008-04-17 01:53:25.000000000 +0400
++++ src/MultiPeakFit.h	2013-09-12 22:40:34.965752536 +0400
+@@ -48,6 +48,9 @@
+ 		static QString generateFormula(int order, PeakProfile profile);
+ 		static QStringList generateParameterList(int order);
+ 		static QStringList generateExplanationList(int order);
++        
++        //! Used by the GaussFit and LorentzFit derived classes to calculate initial values for the parameters 
++        void guessInitialValues();
+ 
+ 	private:
+ 		QString logFitInfo(double *par, int iterations, int status, const QString& plotName);
+@@ -57,9 +60,6 @@
+ 		void insertPeakFunctionCurve(double *x, double *y, int peak);
+ 		void storeCustomFitResults(double *par);
+ 
+-		//! Used by the GaussFit and LorentzFit derived classes to calculate initial values for the parameters 
+-		void guessInitialValues();
+-
+ 		//! Number of peaks
+ 		int d_peaks;
+ 
diff --git a/scidavis/qt-assistant-compat.patch b/scidavis/qt-assistant-compat.patch
index 68a1725..8c40e25 100644
--- a/scidavis/qt-assistant-compat.patch
+++ b/scidavis/qt-assistant-compat.patch
@@ -1,6 +1,6 @@
-diff -uNr scidavis-0.2.4.orig/scidavis/src/ApplicationWindow.cpp scidavis-0.2.4/scidavis/src/ApplicationWindow.cpp
---- scidavis-0.2.4.orig/scidavis/src/ApplicationWindow.cpp	2010-10-06 20:00:36.000000000 +0200
-+++ scidavis-0.2.4/scidavis/src/ApplicationWindow.cpp	2010-10-06 20:01:28.000000000 +0200
+diff -uNr src/ApplicationWindow.cpp.old src/ApplicationWindow.cpp
+--- src/ApplicationWindow.cpp.old	2010-10-06 20:00:36.000000000 +0200
++++ src/ApplicationWindow.cpp	2010-10-06 20:01:28.000000000 +0200
 @@ -135,7 +135,7 @@
  #include <QVarLengthArray>
  #include <QList>
diff --git a/scidavis/scidavis.sip.patch b/scidavis/scidavis.sip.patch
index c9bd450..cb37afc 100644
--- a/scidavis/scidavis.sip.patch
+++ b/scidavis/scidavis.sip.patch
@@ -1,5 +1,5 @@
---- scidavis-0.2.4.orig/scidavis/src/scidavis.sip	2010-03-12 17:49:20.000000000 +0300
-+++ scidavis-0.2.4/scidavis/src/scidavis.sip	2013-09-10 05:17:57.599898053 +0400
+--- src/scidavis.sip.old	2010-03-12 17:49:20.000000000 +0300
++++ src/scidavis.sip	2013-09-10 05:17:57.599898053 +0400
 @@ -926,7 +926,7 @@
    void removeCurve(const QString&);
    void deleteFitCurves();