diff --git a/scidavis/PKGBUILD b/scidavis/PKGBUILD index a63df8b..4a4af05 100644 --- a/scidavis/PKGBUILD +++ b/scidavis/PKGBUILD @@ -5,29 +5,26 @@ pkgname=scidavis pkgver=1.D8 -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') -depends=('gsl' 'glu' 'liborigin2' 'mesa' 'muparser' 'python2-pyqt4' 'shared-mime-info' +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-origin.patch scidavis-python.patch scidavis-qtassistant.patch scidavis-qwt5.patch) install=${pkgname}.install md5sums=('c421b6a38f5183780bdf6c5960d92df5' - 'SKIP' '8ee84407966fed8eb12efeee42c5ef9c' 'b35c4fcbc22ca981a1679ae571ab3bed' '749297643799f48527178bdb43ad94e7') prepare() { cd "${srcdir}" - # use system liborigin - patch -p0 -i "${srcdir}/scidavis-origin.patch" # python patch patch -p0 -i "${srcdir}/scidavis-python.patch" # fix qtassistant @@ -49,4 +46,7 @@ package() { _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" + + # remove liborigin files since it uses static library + rm -rf "${pkgdir}/usr/local" } diff --git a/scidavis/scidavis-origin.patch b/scidavis/scidavis-origin.patch deleted file mode 100644 index 6852c45..0000000 --- a/scidavis/scidavis-origin.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ruN scidavis.1.D8.orig/config.pri scidavis.1.D8/config.pri ---- scidavis.1.D8.orig/config.pri 2014-07-23 12:39:15.000000000 +0400 -+++ scidavis.1.D8/config.pri 2014-07-23 13:37:24.654969180 +0400 -@@ -198,7 +198,7 @@ - - # code for maintained branch of liborigin. - contains(DEFINES, ORIGIN_IMPORT) { -- LIBS += ../3rdparty/liborigin/liborigin.a -+# LIBS += ../3rdparty/liborigin/liborigin.a - INCLUDEPATH += ../3rdparty/liborigin - } - -@@ -274,6 +274,8 @@ - # LIBS += -L../3rdparty/liborigin -lorigin - # INCLUDEPATH += ../3rdparty/liborigin - # } -+ INCLUDEPATH += /usr/include/liborigin2 -+ LIBS += -lorigin2 - } - - contains(PRESET, self_contained) { -diff -ruN scidavis.1.D8.orig/scidavis.pro scidavis.1.D8/scidavis.pro ---- scidavis.1.D8.orig/scidavis.pro 2014-07-23 09:01:09.000000000 +0400 -+++ scidavis.1.D8/scidavis.pro 2014-07-23 13:37:01.634969788 +0400 -@@ -7,7 +7,7 @@ - ################################################# - TEMPLATE = subdirs - --SUBDIRS = 3rdparty/liborigin scidavis test -+SUBDIRS = scidavis test - CONFIG+=ordered - - # Overwrite the qmake generated Makefile by the cmake one