arcanis/pkgbuild
1
0
Fork 0
mirror of https://github.com/arcan1s/pkgbuild.git synced 2025-04-24 23:47:17 +00:00
Code Issues Projects Releases Wiki Activity

scidavis 1.D1

Browse Source
This commit is contained in:
arcan1s 2014-01-20 22:21:58 +04:00
parent 8e154e0aca
commit e58f0c7aa7
9 changed files with 101 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
scidavis/PKGBUILD
View File

@ -1,64 +1,49 @@
# Contributor: Knut Franke - Knut.Franke*gmx.de
# Contributor: Olaf Leidinger <leidola@newcon.de>
# Contributor: Robal <nigrantis.tigris*.gmail.com>
# Maintainer: Evgeniy "arcanis" Alexeev <esalexeev@gmail.com>
# Maintainer: Evgeniy "arcanis" Alexeev <arcanis.arch at gmail dot com>
# Contributor: Knut Franke <Knut.Franke ad gmx dot de>
# Contributor: Olaf Leidinger <leidola at newcon dot de>
# Contributor: Robal <nigrantis.tigris at gmail dot com>
pkgname=scidavis
pkgver=0.2.4
pkgrel=9
pkgver=1.D1
pkgrel=1
pkgdesc="Application for Scientific Data Analysis and Visualization, fork of QtiPlot"
arch=('i686' 'x86_64')
url="http://scidavis.sourceforge.net/"
license=('GPL')
depends=('gsl' 'mesa' 'muparser' 'python2-pyqt4' 'shared-mime-info'
'qt-assistant-compat' 'qwtplot3d' 'qwt5')
source=(http://prdownloads.sourceforge.net/sourceforge/scidavis/${pkgname}-${pkgver}.tar.bz2
multipeakfit.h.patch
scidavis.pro.patch
scidavis.sip.patch
source=(http://prdownloads.sourceforge.net/sourceforge/scidavis/${pkgname}.${pkgver}.tar.gz
scidavis-python2.patch
qt-assistant-compat.patch
qwt5.patch)
scidavis-qtassistant.patch
scidavis-qwt5.patch)
install=${pkgname}.install
md5sums=('c5650475c5e0b22f9ee5dc49630a0e89'
'59ac672f49e1e4e034bfdfb566b99589'
'2ec36f34039ca8cd6db2401b1215590b'
'c17bf09fa34cc9a75675d95b1585147f'
'ff0a7cb32e8ed439f008bfd114cbf611'
'2fefdab0fa536098637e7250efcd727e'
'159aad53f13328123d42bfb7a4adf1b8')
md5sums=('a7cd7550bdb2fa74d88649da7934bf97'
'a719a66cd27f0486c6e12f64ef568a6e'
'980b5c6826d658311dc9edfe42014669'
'262fb9d038cacb3e98946f3d05aaed49')
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 -p0 < "${srcdir}/scidavis.sip.patch"
# change python to python2
patch < "${srcdir}/scidavis-python2.patch"
# fix path to QtAssistant header
patch -p0 < "${srcdir}/qt-assistant-compat.patch"
# change qwt to qwt5
patch < "${srcdir}/qwt5.patch"
prepare() {
cd "${srcdir}"
# fix python
patch -p0 -i "${srcdir}/scidavis-python2.patch"
# fix qtassistant
patch -p0 -i "${srcdir}/scidavis-qtassistant.patch"
# fix qwt
patch -p0 -i "${srcdir}/scidavis-qwt5.patch"
}
build()
{
cd "${srcdir}/${pkgname}-${pkgver}"
build() {
cd "${srcdir}/${pkgname}.${pkgver}"
qmake-qt4
make
}
package ()
{
cd "${srcdir}/${pkgname}-${pkgver}"
package() {
cd "${srcdir}/${pkgname}.${pkgver}"
make INSTALL_ROOT="${pkgdir}" install
_pydir=`python2 -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
python2 `dirname ${_pydir}`/py_compile.py "${pkgdir}/etc/scidavisrc.py"
python2 `dirname ${_pydir}`/py_compile.py "${pkgdir}/usr/share/scidavis/scidavisUtil.py"
_pydir=$(python2 -c "from distutils import sysconfig; print sysconfig.get_python_lib()")
python2 $(dirname ${_pydir})/py_compile.py "${pkgdir}/etc/scidavisrc.py"
python2 $(dirname ${_pydir})/py_compile.py "${pkgdir}/usr/share/scidavis/scidavisUtil.py"
}

22
scidavis/multipeakfit.h.patch
View File

@ -1,22 +0,0 @@
--- 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;

12
scidavis/qt-assistant-compat.patch
View File

@ -1,12 +0,0 @@
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>
#include <QUrl>
-#include <QAssistantClient>
+#include <QtAssistant/qassistantclient.h>
#include <QStatusBar>
#include <QToolButton>
#include <QSignalMapper>

36
scidavis/qwt5.patch
View File

@ -1,36 +0,0 @@
*** scidavis.pro-old 2011-08-07 02:40:22.794577716 +0200
--- scidavis.pro 2011-08-07 02:40:50.047911224 +0200
***************
*** 102,108 ****
### Link everything dynamically
#############################################################################
! unix:INCLUDEPATH += /usr/include/qwt
unix:LIBS += -L/usr/lib$${libsuff}
## dynamically link against Qwt(3D) installed system-wide
## WARNING: make sure they are compiled against >= Qt4.2
--- 102,108 ----
### Link everything dynamically
#############################################################################
! unix:INCLUDEPATH += /usr/include/qwt5
unix:LIBS += -L/usr/lib$${libsuff}
## dynamically link against Qwt(3D) installed system-wide
## WARNING: make sure they are compiled against >= Qt4.2
***************
*** 110,116 ****
## cause problems.
unix:INCLUDEPATH += /usr/include/qwtplot3d
unix:LIBS += -lqwtplot3d
! unix:LIBS += -lqwt
##dynamically link against GSL and zlib installed system-wide
unix:LIBS += -lgsl -lgslcblas -lz -lmuparser
--- 110,116 ----
## cause problems.
unix:INCLUDEPATH += /usr/include/qwtplot3d
unix:LIBS += -lqwtplot3d
! unix:LIBS += -lqwt5
##dynamically link against GSL and zlib installed system-wide
unix:LIBS += -lgsl -lgslcblas -lz -lmuparser

123
scidavis/scidavis-python2.patch
View File

@ -1,74 +1,49 @@
# HG changeset patch
# User Robal <nigrantis.tigris@gmail.com>
# Date 1287746261 -7200
# Node ID 1f5799d979b49f7bdd5ebb58e9c2083081147529
# Parent 5765007ad9e767615a57ead333906b19cfa43c54
set python2 env
diff -r 5765007ad9e7 -r 1f5799d979b4 scidavis/python-includepath.py
--- a/scidavis/python-includepath.py Fri Oct 22 13:09:25 2010 +0200
+++ b/scidavis/python-includepath.py Fri Oct 22 13:17:41 2010 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
from distutils import sysconfig
from PyQt4 import pyqtconfig
config = pyqtconfig.Configuration()
diff -r 5765007ad9e7 -r 1f5799d979b4 scidavis/python-libs-win.py
--- a/scidavis/python-libs-win.py Fri Oct 22 13:09:25 2010 +0200
+++ b/scidavis/python-libs-win.py Fri Oct 22 13:17:41 2010 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
from PyQt4 import pyqtconfig
config = pyqtconfig.Configuration()
diff -r 5765007ad9e7 -r 1f5799d979b4 scidavis/python-sipcmd.py
--- a/scidavis/python-sipcmd.py Fri Oct 22 13:09:25 2010 +0200
+++ b/scidavis/python-sipcmd.py Fri Oct 22 13:17:41 2010 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
from PyQt4 import pyqtconfig
config = pyqtconfig.Configuration()
flags = []
diff -r 5765007ad9e7 -r 1f5799d979b4 scidavis/python.pri
--- a/scidavis/python.pri Fri Oct 22 13:09:25 2010 +0200
+++ b/scidavis/python.pri Fri Oct 22 13:17:41 2010 +0200
@@ -15,7 +15,7 @@
SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
unix {
- INCLUDEPATH += $$system(python python-includepath.py)
+ INCLUDEPATH += $$system(python2 python-includepath.py)
macx {
LIBS += -framework Python
} else {
@@ -23,7 +23,7 @@
}
LIBS += -lm
system(mkdir -p $${SIP_DIR})
- system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)
+ system($$system(python2 python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)
}
win32 {
# HG changeset patch
# User Robal <nigrantis.tigris@gmail.com>
# Date 1287751697 -7200
# Node ID 42d95b7369a82382d81670c5d0af3d675262c93f
# Parent 1f5799d979b49f7bdd5ebb58e9c2083081147529
change missed 'python' to 'python2' in python.pri
diff -r 1f5799d979b4 -r 42d95b7369a8 scidavis/python.pri
--- a/scidavis/python.pri Fri Oct 22 13:17:41 2010 +0200
+++ b/scidavis/python.pri Fri Oct 22 14:48:17 2010 +0200
@@ -19,7 +19,7 @@
macx {
LIBS += -framework Python
} else {
- LIBS += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
+ LIBS += $$system(python2 -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
}
LIBS += -lm
system(mkdir -p $${SIP_DIR})
diff -ruN scidavis.1.D1.orig/scidavis/python-includepath.py scidavis.1.D1/scidavis/python-includepath.py
--- scidavis.1.D1.orig/scidavis/python-includepath.py 2013-12-27 21:04:33.000000000 +0400
+++ scidavis.1.D1/scidavis/python-includepath.py 2014-01-20 21:48:05.381379147 +0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
############################################################################
# #
diff -ruN scidavis.1.D1.orig/scidavis/python-libs-win.py scidavis.1.D1/scidavis/python-libs-win.py
--- scidavis.1.D1.orig/scidavis/python-libs-win.py 2013-12-27 21:04:33.000000000 +0400
+++ scidavis.1.D1/scidavis/python-libs-win.py 2014-01-20 21:48:12.501378852 +0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
############################################################################
# #
diff -ruN scidavis.1.D1.orig/scidavis/python-sipcmd.py scidavis.1.D1/scidavis/python-sipcmd.py
--- scidavis.1.D1.orig/scidavis/python-sipcmd.py 2013-12-27 21:04:33.000000000 +0400
+++ scidavis.1.D1/scidavis/python-sipcmd.py 2014-01-20 21:48:18.078045287 +0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
############################################################################
# #
diff -ruN scidavis.1.D1.orig/scidavis/python.pri scidavis.1.D1/scidavis/python.pri
--- scidavis.1.D1.orig/scidavis/python.pri 2013-12-27 21:04:33.000000000 +0400
+++ scidavis.1.D1/scidavis/python.pri 2014-01-20 21:49:07.758043225 +0400
@@ -15,15 +15,15 @@
SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
unix {
- INCLUDEPATH += $$system(python python-includepath.py)
+ INCLUDEPATH += $$system(python2 python-includepath.py)
macx {
LIBS += -framework Python
} else {
- LIBS += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
+ LIBS += $$system(python2 -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
}
LIBS += -lm
system(mkdir -p $${SIP_DIR})
- system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)
+ system($$system(python2 python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)
}
win32 {

12
scidavis/scidavis-qtassistant.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ruN scidavis.1.D1.orig/scidavis/src/ApplicationWindow.cpp scidavis.1.D1/scidavis/src/ApplicationWindow.cpp
--- scidavis.1.D1.orig/scidavis/src/ApplicationWindow.cpp 2013-12-27 21:04:33.000000000 +0400
+++ scidavis.1.D1/scidavis/src/ApplicationWindow.cpp 2014-01-20 21:55:16.441361255 +0400
@@ -142,7 +142,7 @@
#include <QVarLengthArray>
#include <QList>
#include <QUrl>
-#include <QtAssistant/QAssistantClient>
+#include <QtAssistant/qassistantclient.h>
#include <QStatusBar>
#include <QToolButton>
#include <QSignalMapper>

12
scidavis/scidavis-qwt5.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ruN scidavis.1.D1.orig/scidavis/scidavis.pro scidavis.1.D1/scidavis/scidavis.pro
--- scidavis.1.D1.orig/scidavis/scidavis.pro 2013-12-27 21:04:33.000000000 +0400
+++ scidavis.1.D1/scidavis/scidavis.pro 2014-01-20 22:08:57.514660507 +0400
@@ -234,7 +234,7 @@
} else {
INCLUDEPATH += /usr/include/qwt
}
- LIBS += -lqwt -lz -lGLU -lQtAssistantClient
+ LIBS += -lqwt5 -lz -lGLU -lQtAssistantClient
INCLUDEPATH += /usr/include/qwtplot3d
LIBS += -lqwtplot3d

49
scidavis/scidavis.pro.patch
View File

@ -1,49 +0,0 @@
--- scidavis.pro.orig 2010-03-12 19:40:49.000000000 +0100
+++ scidavis.pro 2010-03-12 19:42:34.000000000 +0100
@@ -87,32 +87,32 @@
### are compiled against Qt4), dynamically against everything else.
#############################################################################
-unix:INCLUDEPATH += ../3rdparty/qwtplot3d/include
-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+#unix:INCLUDEPATH += ../3rdparty/qwtplot3d/include
+#unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
-unix:INCLUDEPATH += ../3rdparty/qwt/src
-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
+#unix:INCLUDEPATH += ../3rdparty/qwt/src
+#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
-unix:LIBS += -L/usr/lib$${libsuff}
-unix:LIBS += -lgsl -lgslcblas -lz
-unix:LIBS += -lmuparser
-unix:INCLUDEPATH += /usr/include/muParser
+#unix:LIBS += -L/usr/lib$${libsuff}
+#unix:LIBS += -lgsl -lgslcblas -lz
+#unix:LIBS += -lmuparser
+#unix:INCLUDEPATH += /usr/include/muParser
#############################################################################
### Link everything dynamically
#############################################################################
-#unix:INCLUDEPATH += /usr/include/qwt5
-#unix:LIBS += -L/usr/lib$${libsuff}
+unix:INCLUDEPATH += /usr/include/qwt
+unix:LIBS += -L/usr/lib$${libsuff}
## dynamically link against Qwt(3D) installed system-wide
## WARNING: make sure they are compiled against >= Qt4.2
## Mixing Qt 4.2 and Qt >= 4.3 compiled stuff may also
## cause problems.
-#unix:INCLUDEPATH += /usr/include/qwtplot3d
-#unix:LIBS += -lqwtplot3d
-#unix:LIBS += -lqwt
+unix:INCLUDEPATH += /usr/include/qwtplot3d
+unix:LIBS += -lqwtplot3d
+unix:LIBS += -lqwt
##dynamically link against GSL and zlib installed system-wide
-#unix:LIBS += -lgsl -lgslcblas -lz -lmuparser
+unix:LIBS += -lgsl -lgslcblas -lz -lmuparser -lGLU
#############################################################################
### Default settings for Windows

20
scidavis/scidavis.sip.patch
View File

@ -1,20 +0,0 @@
--- 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();
int curves() /PyName=numCurves/;
- QList<QwtPlotCurve*> curves() const /NoDerived/;
+ QList<QwtPlotCurve*> curves() /NoDerived/;
%MethodCode
sipRes = new QList<QwtPlotCurve*>();
for (int i = 0; i<sipCpp->curves(); i++)
@@ -995,7 +995,7 @@
sipRes = sipCpp->d_plot->canvas();
%End
- QPointF pickPoint() const /NoDerived/;
+ QPointF pickPoint() /NoDerived/;
%MethodCode
ApplicationWindow *app = sipscidavis_app();
sipRes = new QPointF();