upgpkg: scidavis-qt5 2.4.0+r1-1

upstream release

updated to upstream from Dec 26, 2021

2 files changed, 18 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 674779e2e189..a8f6222e9844 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = scidavis-qt5
 	pkgdesc = Application for Scientific Data Analysis and Visualization, fork of QtiPlot. Qt5 port
-	pkgver = 2.4.0
+	pkgver = 2.4.0+r1
 	pkgrel = 1
 	url = http://scidavis.sourceforge.net/
 	arch = x86_64
@@ -8,8 +8,8 @@ pkgbase = scidavis-qt5
 	makedepends = boost
 	makedepends = cmake
 	makedepends = qt5-tools
-	makedepends = sip4
-	makedepends = python-sip4
+	makedepends = sip
+	makedepends = pyqt-builder
 	makedepends = qwt5-qt5>=5.2.3.1-2
 	depends = gsl
 	depends = glu
@@ -24,12 +24,11 @@ pkgbase = scidavis-qt5
 	depends = python
 	depends = python-scipy
 	conflicts = scidavis
-	source = scidavis-2.4.0.zip::https://github.com/highperformancecoder/scidavis/archive/2.4.0.zip
-	source = liborigin-4788f5bf674f93dab26c01bed84813e53f259c86.zip::https://github.com/SciDAVis/liborigin/archive/4788f5bf674f93dab26c01bed84813e53f259c86.zip
-	source = qwtplot3d-fce8eb0034827f0e0f86a36c075ef648343ac7cf.zip::https://github.com/SciDAVis/qwtplot3d/archive/fce8eb0034827f0e0f86a36c075ef648343ac7cf.zip
-	sha512sums = a77733b397ed3d26f872f6dac4d6bf73df55499da797266337a1f894be2b72d6a6568ed38308ee04b02e0c18fcdfc68b9b1aebe808fb2878b6492615047ec242
-	sha512sums = aab71ea6100df3c81194e7304a07cf51f2c1fbb4d8f6292a2aff003d704fe14fc9ab8fd63d46b8403adf4f818297c2db852acf8e6431166d2055cda928e2a9eb
-	sha512sums = 83462b94c8063e7dbd9251a181ff4dc7862dd274268fcd7ea79e7888befdd820b159486c3e884fa172ffd12a31b537bb13fe605d14ea019d8977368baaf89850
+	source = scidavis-2.4.0+r1.zip::https://github.com/SciDAVis/scidavis/archive/b7a35c7fcb9d1badac418bf07ab8353bbe6658f1.zip
+	source = liborigin-a92f26f28e531f64684b66a2731dd617bea3cb45.zip::https://github.com/SciDAVis/liborigin/archive/a92f26f28e531f64684b66a2731dd617bea3cb45.zip
+	source = qwtplot3d-b2655743d30ed3185f3c0e2626b33a1d29655216.zip::https://github.com/SciDAVis/qwtplot3d/archive/b2655743d30ed3185f3c0e2626b33a1d29655216.zip
+	sha512sums = 1ada921f7cdcaf0d36ea3237d7c30b6e9457710e4340eeeb1f2afe6965804613089b5a6994954c48e16702cae86c2a8426b471b5e4c7c64222655c8e0c5e617f
+	sha512sums = aa63824a62cb4abf15241d35091c697c143ea0185e7efedbf3931c4cb427c5646606e15a6dc1cdeb2e143d6d77476b9fdd877cff3cc797d7439a5cba953a450c
+	sha512sums = 5784fe55b11ee6437b765964b87522dd60a1e84e4424982ca3f3f3c6b09d986c5d5f8f0dfa593d70027f614865261eee27c7827c4d194cbe2f678d60ae4bf0b7
 
 pkgname = scidavis-qt5
-
diff --git a/PKGBUILD b/PKGBUILD
index 9bc9364d4b35..6fd86f7329b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,17 +9,17 @@
 
 _pkgname=scidavis
 pkgname=scidavis-qt5
-pkgver=2.4.0
-_commit=${pkgver}
-_commit_liborigin=4788f5bf674f93dab26c01bed84813e53f259c86
-_commit_qwtplot3d=fce8eb0034827f0e0f86a36c075ef648343ac7cf
+pkgver=2.4.0+r1
+_commit=b7a35c7fcb9d1badac418bf07ab8353bbe6658f1
+_commit_liborigin=a92f26f28e531f64684b66a2731dd617bea3cb45
+_commit_qwtplot3d=b2655743d30ed3185f3c0e2626b33a1d29655216
 pkgrel=1
 pkgdesc="Application for Scientific Data Analysis and Visualization, fork of QtiPlot. Qt5 port"
 arch=('x86_64')
 url="http://scidavis.sourceforge.net/"
 license=('GPL')
 makedepends=('boost' 'cmake' 'qt5-tools'
-'sip4' 'python-sip4'
+'sip' 'pyqt-builder'
 'qwt5-qt5>=5.2.3.1-2'
 )
 depends=('gsl' 'glu' 'mesa' 'muparser>=2.3.2' 'shared-mime-info'
@@ -30,13 +30,13 @@ depends=('gsl' 'glu' 'mesa' 'muparser>=2.3.2' 'shared-mime-info'
 'python' 'python-scipy')
 conflicts=('scidavis')
 source=(
-   "${_pkgname}-${pkgver}.zip::https://github.com/highperformancecoder/scidavis/archive/${_commit}.zip"
+   "${_pkgname}-${pkgver}.zip::https://github.com/SciDAVis/scidavis/archive/${_commit}.zip"
    "liborigin-${_commit_liborigin}.zip::https://github.com/SciDAVis/liborigin/archive/${_commit_liborigin}.zip"
    "qwtplot3d-${_commit_qwtplot3d}.zip::https://github.com/SciDAVis/qwtplot3d/archive/${_commit_qwtplot3d}.zip"
 )
-sha512sums=('a77733b397ed3d26f872f6dac4d6bf73df55499da797266337a1f894be2b72d6a6568ed38308ee04b02e0c18fcdfc68b9b1aebe808fb2878b6492615047ec242'
-            'aab71ea6100df3c81194e7304a07cf51f2c1fbb4d8f6292a2aff003d704fe14fc9ab8fd63d46b8403adf4f818297c2db852acf8e6431166d2055cda928e2a9eb'
-            '83462b94c8063e7dbd9251a181ff4dc7862dd274268fcd7ea79e7888befdd820b159486c3e884fa172ffd12a31b537bb13fe605d14ea019d8977368baaf89850')
+sha512sums=('1ada921f7cdcaf0d36ea3237d7c30b6e9457710e4340eeeb1f2afe6965804613089b5a6994954c48e16702cae86c2a8426b471b5e4c7c64222655c8e0c5e617f'
+            'aa63824a62cb4abf15241d35091c697c143ea0185e7efedbf3931c4cb427c5646606e15a6dc1cdeb2e143d6d77476b9fdd877cff3cc797d7439a5cba953a450c'
+            '5784fe55b11ee6437b765964b87522dd60a1e84e4424982ca3f3f3c6b09d986c5d5f8f0dfa593d70027f614865261eee27c7827c4d194cbe2f678d60ae4bf0b7')
 
 prepare() {
   cd "${_pkgname}-${_commit}"