summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalkut2018-06-21 10:38:54 -0400
committerMalkut2018-06-21 10:38:54 -0400
commit9294c709913b4dc6fb8930622b94b75c12c72a4e (patch)
treedf8a27241125a67110a0a30063f5df22233aed8a
parentb9139b80778975897d74c3f16ba585e046115fa6 (diff)
downloadaur-9294c709913b4dc6fb8930622b94b75c12c72a4e.tar.gz
Add/Removed patch files
Signed-off-by: Malkut <>
-rw-r--r--.SRCINFO6
-rw-r--r--0001-Fixed-compilation-error-for-ambiguous-overload-off-a.patch26
2 files changed, 3 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2d02c2029831..0af2daf29d6e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,7 +8,7 @@ pkgbase = kst-git
license = GPL
makedepends = cmake
depends = gsl
- depends = qt4
+ depends = qt5
depends = muparser
depends = python2-scipy>=0.9
depends = python2-numpy>=1.6
@@ -18,9 +18,9 @@ pkgbase = kst-git
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
+ source = 0001-Build-fixes-for-Qt-5.11.patch
md5sums = SKIP
- md5sums = 43dad5d63cf1d3415a5dda3df2e02c08
+ md5sums = 755de805f90f6e76eddd1f5f59d86a98
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
deleted file mode 100644
index 48daf230e768..000000000000
--- a/0001-Fixed-compilation-error-for-ambiguous-overload-off-a.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-