Fixed build to support HDF5 and faster build.

4 files changed, 41 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0e31d124fd91..68d6b760dca6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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-Fixing-missing-QStyle-in-shortcutdialog.cpp.patch
+        source = 0001-Fixed-HDF5-patch-for-archlinux-users.patch
 	md5sums = SKIP
-        md5sums = 2b38f2c30bfbf64bbc392343e0590697
+        md5sums = 775b873a12b1b6125bd02cad752a9306
 
 pkgname = kst-git
 
diff --git a/0001-Fixed-HDF5-patch-for-archlinux-users.patch b/0001-Fixed-HDF5-patch-for-archlinux-users.patch
new file mode 100644
index 000000000000..402acf9e2512
--- /dev/null
+++ b/0001-Fixed-HDF5-patch-for-archlinux-users.patch
@@ -0,0 +1,25 @@
+From 5ebc83ae1aee4dfb59b124a0e2a7dda5127d7c48 Mon Sep 17 00:00:00 2001
+From: Nicolas Menard <nicolas.menard@wyss.harvard.edu>
+Date: Mon, 1 Jul 2019 09:40:29 -0400
+Subject: [PATCH] Fixed HDF5 patch for archlinux users
+
+---
+ src/datasources/hdf5/hdf5.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/datasources/hdf5/hdf5.h b/src/datasources/hdf5/hdf5.h
+index 03bdd792..7d5a4961 100644
+--- a/src/datasources/hdf5/hdf5.h
++++ b/src/datasources/hdf5/hdf5.h
+@@ -18,7 +18,7 @@
+ #include <dataplugin.h>
+ 
+ #include <QFileInfo>
+-#include <hdf5/serial/H5Cpp.h>
++#include <H5Cpp.h>
+ #include <exception>
+ 
+ #include "debug.h"
+-- 
+2.22.0
+
diff --git a/0001-Fixing-missing-QStyle-in-shortcutdialog.cpp.patch b/0001-Fixing-missing-QStyle-in-shortcutdialog.cpp.patch
deleted file mode 100644
index 40d0825bf029..000000000000
--- a/0001-Fixing-missing-QStyle-in-shortcutdialog.cpp.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 92795a6fc87d7e9edb03e866004acc72b2160bdc Mon Sep 17 00:00:00 2001
-From: Nicolas Menard <nicolas.menard@wyss.harvard.edu>
-Date: Sat, 13 Oct 2018 15:48:42 -0400
-Subject: [PATCH] Fixing missing QStyle in shortcutdialog.cpp
-
----
- src/libkstapp/shortcutdialog.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libkstapp/shortcutdialog.cpp b/src/libkstapp/shortcutdialog.cpp
-index 6cf36c40..388e1813 100644
---- a/src/libkstapp/shortcutdialog.cpp
-+++ b/src/libkstapp/shortcutdialog.cpp
-@@ -22,7 +22,7 @@
- #include <QDebug>
- #include <QTextEdit>
- #include <QFile>
--
-+#include <QStyle>
- #include <QStringList>
- 
- namespace Kst {
--- 
-2.19.1
-
diff --git a/PKGBUILD b/PKGBUILD
index ace16b7f71b2..6a5f70ce0370 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,28 @@
 _pkgname="kst"
 pkgname="${_pkgname}-git"
 pkgrel=1
-pkgver=2.0.8r3361.baf3509d
+pkgver=2.0.8r3383.8294c2fe
 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' 'qt5-base' 'qt5-svg' 'muparser' 'python2-scipy>=0.9' 'python2-numpy>=1.6' 'cfitsio' 'python2-pyside')
+depends=('hdf5' 'gsl' 'qt5-base' 'qt5-svg' '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" "0001-Fixing-missing-QStyle-in-shortcutdialog.cpp.patch")
-md5sums=('SKIP' '2b38f2c30bfbf64bbc392343e0590697')
+source=("git://anongit.kde.org/kst-plot.git" "0001-Fixed-HDF5-patch-for-archlinux-users.patch")
+md5sums=('SKIP' '775b873a12b1b6125bd02cad752a9306')
+provides=("${_pkgname}")
 pkgver() {
-  cd "${srcdir}/${_pkgname}"
+  cd "${srcdir}/${_pkgname}-plot"
   printf "2.0.8r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
-conflicts=("kst")
+conflicts=("${_pkgname}")
 build() {
-  cd "${srcdir}/${_pkgname}"
+  cd "${srcdir}/${_pkgname}-plot"
   cp -r ./cmake/pyKst/* ./pyKst/
   cmake ./ \
   -Dkst_release=2 \
@@ -31,14 +32,15 @@ build() {
   -DPYTHON_EXECUTABLE=/usr/bin/python2.7 \
   -Dkst_python_prefix=/usr/lib/python2.7 \
   -Dkst_install_prefix=/usr \
-  -Dkst_qt5=ON
+  -Dkst_qt5=ON \
+  -Dkst_merge_files=ON
 }
 prepare(){
-	cd "${srcdir}/${_pkgname}"
-	patch -p1 < ../0001-Fixing-missing-QStyle-in-shortcutdialog.cpp.patch
+	cd "${srcdir}/${_pkgname}-plot"
+	patch -p1 < ../0001-Fixed-HDF5-patch-for-archlinux-users.patch
 }
 package() {
-  cd "${srcdir}/${_pkgname}"
+  cd "${srcdir}/${_pkgname}-plot"
   make -j$(nproc) DESTDIR="${pkgdir}" install
-  install -D -m644 "COPYING" "$pkgdir/usr/share/licenses/${_pkgname}/LICENSE"
+  install -D -m644 "COPYING" "$pkgdir/usr/share/licenses/${_pkgname}-plot/LICENSE"
 }