summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalkut2018-10-13 16:14:39 -0400
committerMalkut2018-10-13 16:14:39 -0400
commit9968c791bf100077b1b29b2198b62faa6332c310 (patch)
tree29f25457a76d5db1ad2a4617d4a3a2b58b2ae4d5
parentef87ca55904fd6c5bfdcee280c50dc006aabc1ef (diff)
downloadaur-9968c791bf100077b1b29b2198b62faa6332c310.tar.gz
Removed previous build fixes and added new one
-rw-r--r--.SRCINFO4
-rw-r--r--0001-Build-fixes-for-Qt-5.11.patch25
-rw-r--r--0001-Fixing-missing-QStyle-in-shortcutdialog.cpp.patch25
-rw-r--r--PKGBUILD8
4 files changed, 31 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6bf4c2fdcb6c..0e31d124fd91 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-Build-fixes-for-Qt-5.11.patch
+ source = 0001-Fixing-missing-QStyle-in-shortcutdialog.cpp.patch
md5sums = SKIP
- md5sums = b655a89d78c7dc80f7692f5c218e05dc
+ md5sums = 2b38f2c30bfbf64bbc392343e0590697
pkgname = kst-git
diff --git a/0001-Build-fixes-for-Qt-5.11.patch b/0001-Build-fixes-for-Qt-5.11.patch
deleted file mode 100644
index 1f37597576eb..000000000000
--- a/0001-Build-fixes-for-Qt-5.11.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 74f022c09d25fbdcf8373bd5a255d7408ef60801 Mon Sep 17 00:00:00 2001
-From: Nicolas Menard <nicolas.menard@wyss.harvard.edu>
-Date: Wed, 3 Oct 2018 09:14:36 -0400
-Subject: [PATCH] Build fixes for Qt 5.11
-
----
- src/libkstapp/view.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libkstapp/view.h b/src/libkstapp/view.h
-index 95c8c6a5..607991b7 100644
---- a/src/libkstapp/view.h
-+++ b/src/libkstapp/view.h
-@@ -19,7 +19,7 @@
-
- #include "curveplacement.h"
-
--
-+class QMenu;
- class QUndoStack;
- class QXmlStreamWriter;
-
---
-2.19.0
-
diff --git a/0001-Fixing-missing-QStyle-in-shortcutdialog.cpp.patch b/0001-Fixing-missing-QStyle-in-shortcutdialog.cpp.patch
new file mode 100644
index 000000000000..40d0825bf029
--- /dev/null
+++ b/0001-Fixing-missing-QStyle-in-shortcutdialog.cpp.patch
@@ -0,0 +1,25 @@
+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 09525e93df0b..ace16b7f71b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
_pkgname="kst"
pkgname="${_pkgname}-git"
pkgrel=1
-pkgver=2.0.8r3357.9db9477d
+pkgver=2.0.8r3361.baf3509d
pkgdesc="Fast real-time large-dataset viewing and plotting tool for KDE"
arch=('i686' 'x86_64')
url="http://kst-plot.kde.org"
@@ -13,8 +13,8 @@ optdepends=(
)
makedepends=('cmake')
#install=$pkgname.install
-source=("git://github.com/Kst-plot/kst.git" "0001-Build-fixes-for-Qt-5.11.patch")
-md5sums=('SKIP' 'b655a89d78c7dc80f7692f5c218e05dc')
+source=("git://github.com/Kst-plot/kst.git" "0001-Fixing-missing-QStyle-in-shortcutdialog.cpp.patch")
+md5sums=('SKIP' '2b38f2c30bfbf64bbc392343e0590697')
pkgver() {
cd "${srcdir}/${_pkgname}"
printf "2.0.8r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -35,7 +35,7 @@ build() {
}
prepare(){
cd "${srcdir}/${_pkgname}"
- patch -p1 < ../0001-Build-fixes-for-Qt-5.11.patch
+ patch -p1 < ../0001-Fixing-missing-QStyle-in-shortcutdialog.cpp.patch
}
package() {
cd "${srcdir}/${_pkgname}"