diff options
-rw-r--r-- | .SRCINFO | 3 | ||||
-rw-r--r-- | 0001-Fixed-compilation-error-for-ambiguous-overload-off-a.patch | 26 | ||||
-rw-r--r-- | PKGBUILD | 10 |
3 files changed, 35 insertions, 4 deletions
@@ -13,13 +13,14 @@ pkgbase = kst-git depends = python2-scipy>=0.9 depends = python2-numpy>=1.6 depends = cfitsio - depends = netcdf-cxx-legacy depends = python2-pyside optdepends = getdata: provides support for files in the Dirfile format optdepends = libmatio: provides support for Matlab binary files conflicts = kst source = git://github.com/Kst-plot/kst.git + source = 0001-Fixed-compilation-error-for-ambiguous-overload-off-a.patch md5sums = SKIP + md5sums = 43dad5d63cf1d3415a5dda3df2e02c08 pkgname = kst-git diff --git a/0001-Fixed-compilation-error-for-ambiguous-overload-off-a.patch b/0001-Fixed-compilation-error-for-ambiguous-overload-off-a.patch new file mode 100644 index 000000000000..48daf230e768 --- /dev/null +++ b/0001-Fixed-compilation-error-for-ambiguous-overload-off-a.patch @@ -0,0 +1,26 @@ +From 671d22f4c5bd5f971907e13e6b90d4d4ed63f8f8 Mon Sep 17 00:00:00 2001 +From: Nicolas Menard <nicolas.menard@wyss.harvard.edu> +Date: Mon, 28 Sep 2015 09:42:20 -0400 +Subject: [PATCH] Fixed compilation error for ambiguous overload off abs in + curve.cpp + +--- + src/libkstmath/curve.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libkstmath/curve.cpp b/src/libkstmath/curve.cpp +index dc61ae1..ffe0ee6 100644 +--- a/src/libkstmath/curve.cpp ++++ b/src/libkstmath/curve.cpp +@@ -36,7 +36,7 @@ + + #include <time.h> + #include <iostream> +- ++#include <cmath> + // #define DEBUG_VECTOR_CURVE + // #define BENCHMARK + +-- +2.5.3 + @@ -6,15 +6,15 @@ pkgdesc="Fast real-time large-dataset viewing and plotting tool for KDE" arch=('i686' 'x86_64') url="http://kst-plot.kde.org" license=('GPL') -depends=('gsl' 'qt4' 'muparser' 'python2-scipy>=0.9' 'python2-numpy>=1.6' 'cfitsio' 'netcdf-cxx-legacy' 'python2-pyside') +depends=('gsl' 'qt4' 'muparser' 'python2-scipy>=0.9' 'python2-numpy>=1.6' 'cfitsio' 'python2-pyside') optdepends=( 'getdata: provides support for files in the Dirfile format' 'libmatio: provides support for Matlab binary files' ) makedepends=('cmake') #install=$pkgname.install -source=("git://github.com/Kst-plot/kst.git") -md5sums=('SKIP') +source=("git://github.com/Kst-plot/kst.git" "0001-Fixed-compilation-error-for-ambiguous-overload-off-a.patch") +md5sums=('SKIP' '43dad5d63cf1d3415a5dda3df2e02c08') pkgver() { cd "${srcdir}/${_pkgname}" @@ -33,6 +33,10 @@ build() { -Dkst_python_prefix=/usr/lib/python2.7 \ -Dkst_install_prefix=/usr/ } +prepare(){ + cd "${srcdir}/${_pkgname}" + patch -p1 < ../0001-Fixed-compilation-error-for-ambiguous-overload-off-a.patch +} package() { cd "${srcdir}/${_pkgname}" make -j$(nproc) DESTDIR="${pkgdir}" install |