academic/scidavis: Updated for version 1.25.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 6 insertions, 220 deletions

diff --git a/academic/scidavis/fix-gh-issue-90.patch b/academic/scidavis/fix-gh-issue-90.patch
deleted file mode 100644
index 67ffca3062..0000000000
--- a/academic/scidavis/fix-gh-issue-90.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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/fix_issue_with_scipy_vesions.patch b/academic/scidavis/fix_issue_with_scipy_vesions.patch
deleted file mode 100644
index 653ce97f9e..0000000000
--- a/academic/scidavis/fix_issue_with_scipy_vesions.patch
+++ /dev/null
@@ -1,184 +0,0 @@
---- ../../scidavis-1.23/scidavis/scidavisrc.py	2018-06-04 03:22:50.000000000 -0300
-+++ /home/fellype/github/scidavis/scidavis/scidavisrc.py	2018-06-05 15:12:17.000000000 -0300
-@@ -50,6 +50,84 @@
- # Import standard math functions and constants into global namespace.
- import_to_global("math", None, True)
- 
-+# make Qt API available (it gets imported in any case by the scidavis module)
-+global QtGui
-+from PyQt4 import QtGui
-+
-+global QtCore
-+from PyQt4 import QtCore
-+
-+global Qt
-+from PyQt4.QtCore import Qt
-+
-+# import SciDAVis' classes to the global namespace (particularly useful for fits)
-+for name in dir(__main__.scidavis):
-+	setattr(__main__, name, getattr(__main__.scidavis, name))
-+
-+# import selected methods of ApplicationWindow into the global namespace
-+appImports = (
-+	"table", "newTable",
-+	"matrix", "newMatrix",
-+	"graph", "newGraph",
-+	"note", "newNote",
-+	"plot", "plotContour", "plotColorMap", "plotGrayScale",
-+	"activeFolder", "rootFolder", "saveFolder",
-+	"renameWindow", "clone",
-+	"importImage"
-+	)
-+for name in appImports:
-+	setattr(__main__,name,getattr(__main__.scidavis.app,name))
-+
-+# make Y columns indexable (using lookup in corresponding X column)
-+def __column_getitem(self, index):
-+  if self.plotDesignation() != "Y":
-+    return None
-+  x = self.x()
-+  for row in range(self.rowCount()):
-+      if x.columnMode() == "Numeric":
-+          xval = x.valueAt(row)
-+      elif x.columnMode() == "Text":
-+          xval = x.textAt(row)
-+      else:
-+          xval = x.dateTimeAt(row)
-+      if xval == index:
-+          if self.columnMode() == "Numeric":
-+              return self.valueAt(row)
-+          elif self.columnMode() == "Text":
-+              return self.textAt(row)
-+          else:
-+              return self.dateTimeAt(row)
-+__main__.scidavis.Column.__getitem__ = __column_getitem
-+
-+def __column_setitem(self, index, value):
-+  if self.plotDesignation() != "Y":
-+    return None
-+  x = self.x()
-+  for row in range(x.rowCount()):
-+      if x.columnMode() == "Numeric":
-+          xval = x.valueAt(row)
-+      elif x.columnMode() == "Text":
-+          xval = x.textAt(row)
-+      else:
-+          xval = x.dateTimeAt(row)
-+      if xval == index:
-+          if self.columnMode() == "Numeric":
-+              return self.setValueAt(row, value)
-+          elif self.columnMode() == "Text":
-+              return self.setTextAt(row, value)
-+          else:
-+              return self.setDateTimeAt(row, value)
-+__main__.scidavis.Column.__setitem__ = __column_setitem
-+
-+# import utility module
-+import sys
-+sys.path.append(".")
-+try:
-+	import_to_global("scidavisUtil")
-+	print("scidavisUtil successfully imported")
-+except(ImportError): 
-+	print("failed to import scidavisUtil")
-+
- # Import selected parts of scipy.special (if available) into global namespace.
- # See www.scipy.org for information on SciPy and how to get it.
- have_scipy = False
-@@ -76,7 +154,11 @@
- 		# Derivatives of Bessel Functions
- 		"jvp", "yvp", "kvp", "ivp", "h1vp", "h2vp",
- 		# Spherical Bessel Functions
--		"sph_jn", "sph_yn", "sph_jnyn", "sph_in", "sph_kn", "sph_inkn",
-+		## if scipy version is < 1.0.0
-+		#"sph_jn", "sph_yn", "sph_jnyn", "sph_in", "sph_kn", "sph_inkn",
-+		## else
-+		#"spherical_jn", "spherical_yn", "spherical_in", "spherical_kn",
-+		### removing SBFs for a while, until someone finds a way for these two options to coexist
- 		# Ricatti-Bessel Functions
- 		"riccati_jn", "riccati_yn",
- 		# Struve Functions
-@@ -246,83 +328,3 @@
- 		import_to_global("pygsl.sf", special_functions_doublets, True)
- 		print("Loaded %d special functions from pygsl.sf." % (len(special_functions) + len(special_functions_doublets)))
- except(ImportError): pass
--
--
--# make Qt API available (it gets imported in any case by the scidavis module)
--global QtGui
--from PyQt4 import QtGui
--
--global QtCore
--from PyQt4 import QtCore
--
--global Qt
--from PyQt4.QtCore import Qt
--
--# import SciDAVis' classes to the global namespace (particularly useful for fits)
--for name in dir(__main__.scidavis):
--	setattr(__main__, name, getattr(__main__.scidavis, name))
--
--# import selected methods of ApplicationWindow into the global namespace
--appImports = (
--	"table", "newTable",
--	"matrix", "newMatrix",
--	"graph", "newGraph",
--	"note", "newNote",
--	"plot", "plotContour", "plotColorMap", "plotGrayScale",
--	"activeFolder", "rootFolder", "saveFolder",
--	"renameWindow", "clone",
--	"importImage"
--	)
--for name in appImports:
--	setattr(__main__,name,getattr(__main__.scidavis.app,name))
--
--# make Y columns indexable (using lookup in corresponding X column)
--def __column_getitem(self, index):
--  if self.plotDesignation() != "Y":
--    return None
--  x = self.x()
--  for row in range(self.rowCount()):
--      if x.columnMode() == "Numeric":
--          xval = x.valueAt(row)
--      elif x.columnMode() == "Text":
--          xval = x.textAt(row)
--      else:
--          xval = x.dateTimeAt(row)
--      if xval == index:
--          if self.columnMode() == "Numeric":
--              return self.valueAt(row)
--          elif self.columnMode() == "Text":
--              return self.textAt(row)
--          else:
--              return self.dateTimeAt(row)
--__main__.scidavis.Column.__getitem__ = __column_getitem
--
--def __column_setitem(self, index, value):
--  if self.plotDesignation() != "Y":
--    return None
--  x = self.x()
--  for row in range(x.rowCount()):
--      if x.columnMode() == "Numeric":
--          xval = x.valueAt(row)
--      elif x.columnMode() == "Text":
--          xval = x.textAt(row)
--      else:
--          xval = x.dateTimeAt(row)
--      if xval == index:
--          if self.columnMode() == "Numeric":
--              return self.setValueAt(row, value)
--          elif self.columnMode() == "Text":
--              return self.setTextAt(row, value)
--          else:
--              return self.setDateTimeAt(row, value)
--__main__.scidavis.Column.__setitem__ = __column_setitem
--
--# import utility module
--import sys
--sys.path.append(".")
--try:
--	import_to_global("scidavisUtil")
--	print("scidavisUtil successfully imported")
--except(ImportError): 
--	print("failed to import scidavisUtil")
--
diff --git a/academic/scidavis/scidavis.SlackBuild b/academic/scidavis/scidavis.SlackBuild
index 53589845d0..fba0962407 100644
--- a/academic/scidavis/scidavis.SlackBuild
+++ b/academic/scidavis/scidavis.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for SciDAVis
 # Based on the Slackware 14.2 SlackBuild
 #
-# Copyright 2017-2018, Fellype do Nascimento, Campinas - Brazil
+# Copyright 2017-2019, Fellype do Nascimento, Campinas - Brazil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=scidavis
-VERSION=${VERSION:-1.23}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.25}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -68,18 +68,6 @@ find -L . \
 # Correct the manpage path
 sed -i -e 's#share/man#man#' scidavis/scidavis.pro
 
-# Correction needed in order to find qwtplot3d in its default path
-grep -rl "qwtplot3d/" libscidavis/src/ | xargs sed -i "s:<qwtplot3d/:<:"
-
-# Patch to fix issues when SciPy is installed. Without this there may be a
-# problem when running python scripts due to differences between SciPy versions
-# 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
diff --git a/academic/scidavis/scidavis.info b/academic/scidavis/scidavis.info
index 2527497640..03621cb972 100644
--- a/academic/scidavis/scidavis.info
+++ b/academic/scidavis/scidavis.info
@@ -1,8 +1,8 @@
 PRGNAM="scidavis"
-VERSION="1.23"
+VERSION="1.25"
 HOMEPAGE="http://scidavis.sourceforge.net/"
-DOWNLOAD="https://ufpr.dl.sourceforge.net/project/scidavis/SciDAVis/1.23/scidavis-1.23.tar.gz"
-MD5SUM="e6459782ce41e63266a32be9bd4f8cb3"
+DOWNLOAD="https://ufpr.dl.sourceforge.net/project/scidavis/SciDAVis/1.25/scidavis-1.25.tar.gz"
+MD5SUM="ee19e202a322d7eb9e7a4b47b05f68cd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="muParser qwt5 qwtplot3d"