aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFellype do Nascimento <fellype(at)gmail.com>2018-08-02 19:28:41 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-08-02 19:40:39 +0700
commitd575422955ac9ac963d42218f3aae5d11fa99ad5 (patch)
treebbe3e4246f6a491bc8cfe319c04e5f8ab5b518ba
parent48a2f4d3e18d70293f7798f0bec7d37dc6a634ba (diff)
academic/scidavis: Patched to fix crashes.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--academic/scidavis/fix-gh-issue-90.patch18
-rw-r--r--academic/scidavis/scidavis.SlackBuild6
2 files changed, 23 insertions, 1 deletions
diff --git a/academic/scidavis/fix-gh-issue-90.patch b/academic/scidavis/fix-gh-issue-90.patch
new file mode 100644
index 0000000000000..67ffca3062786
--- /dev/null
+++ b/academic/scidavis/fix-gh-issue-90.patch
@@ -0,0 +1,18 @@
+diff --git a/libscidavis/src/ApplicationWindow.cpp b/libscidavis/src/ApplicationWindow.cpp
+index 90d282a4..167debee 100644
+--- libscidavis/src/ApplicationWindow.cpp
++++ libscidavis/src/ApplicationWindow.cpp
+@@ -12521,8 +12521,11 @@ void ApplicationWindow::saveFolderAsProject(Folder *f)
+
+ void ApplicationWindow::showFolderPopupMenu(const QPoint &p, bool fromFolders)
+ {
+- if (fromFolders)
+- showFolderPopupMenuImpl(folders->itemAt(p), fromFolders)->exec(folders->mapToGlobal(p));
++ if (fromFolders) {
++ QMenu* cm = showFolderPopupMenuImpl(folders->itemAt(p), fromFolders);
++ if (cm)
++ cm->exec(folders->mapToGlobal(p));
++ }
+ else
+ showFolderPopupMenuImpl(lv->itemAt(p), fromFolders)->exec(lv->mapToGlobal(p));
+ }
diff --git a/academic/scidavis/scidavis.SlackBuild b/academic/scidavis/scidavis.SlackBuild
index eb2f44118da0d..53589845d0481 100644
--- a/academic/scidavis/scidavis.SlackBuild
+++ b/academic/scidavis/scidavis.SlackBuild
@@ -25,7 +25,7 @@
PRGNAM=scidavis
VERSION=${VERSION:-1.23}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -76,6 +76,10 @@ grep -rl "qwtplot3d/" libscidavis/src/ | xargs sed -i "s:<qwtplot3d/:<:"
# higher or lower than 1.0.0
patch -p1 < $CWD/fix_issue_with_scipy_vesions.patch scidavis/scidavisrc.py
+# Patch to fix crash on right-click inside the project explorer outside the icon for folders area
+# For more information see: https://github.com/highperformancecoder/scidavis/issues/90
+patch -p1 < $CWD/fix-gh-issue-90.patch libscidavis/src/ApplicationWindow.cpp
+
# Since version 1.23 it is possible to build/use SciDAVis with Python 3 - just use
# PYTHON3=yes before execute scidavis.SlackBuild. Default is to use python 2 (PYTHON3=no).
# *** It does not build using Python 3 in Slackware 14.2 or previous because PyQt was not built with