upgpkg: qwt5-qt5 5.2.3.4-3

upgpkg: scidavis-qt5 2.9.0-1

upstream release

no change, just force to re-compile

2 files changed, 10 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b62cff037bbc..0304461f286c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = scidavis-qt5
 	pkgdesc = Application for Scientific Data Analysis and Visualization, fork of QtiPlot. Qt5 port
-	pkgver = 2.4.0+r1
-	pkgrel = 3
+	pkgver = 2.9.0
+	pkgrel = 1
 	url = http://scidavis.sourceforge.net/
 	arch = x86_64
 	license = GPL
@@ -24,10 +24,11 @@ pkgbase = scidavis-qt5
 	depends = python
 	depends = python-scipy
 	conflicts = scidavis
-	source = scidavis-2.4.0+r1.zip::https://github.com/SciDAVis/scidavis/archive/b7a35c7fcb9d1badac418bf07ab8353bbe6658f1.zip
+	conflicts = python-sip4
+	source = scidavis-2.9.0.zip::https://github.com/SciDAVis/scidavis/archive/9eece990c9beed36f36ceadd35fcad92d8f07ca7.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 = 8dd969bd5cb0ae2507e2c511a4c2ff9ba7ab4dca30f45f4807e539bdfa7c7468682aff269817d7046cdc5317ab42cd43e5b66174796425685d3e99016dcbc434
 	sha512sums = aa63824a62cb4abf15241d35091c697c143ea0185e7efedbf3931c4cb427c5646606e15a6dc1cdeb2e143d6d77476b9fdd877cff3cc797d7439a5cba953a450c
 	sha512sums = 5784fe55b11ee6437b765964b87522dd60a1e84e4424982ca3f3f3c6b09d986c5d5f8f0dfa593d70027f614865261eee27c7827c4d194cbe2f678d60ae4bf0b7
 
diff --git a/PKGBUILD b/PKGBUILD
index b476243d5253..2c749ce7762f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,11 +9,11 @@
 
 _pkgname=scidavis
 pkgname=scidavis-qt5
-pkgver=2.4.0+r1
-_commit=b7a35c7fcb9d1badac418bf07ab8353bbe6658f1
+pkgver=2.9.0
+_commit=9eece990c9beed36f36ceadd35fcad92d8f07ca7
 _commit_liborigin=a92f26f28e531f64684b66a2731dd617bea3cb45
 _commit_qwtplot3d=b2655743d30ed3185f3c0e2626b33a1d29655216
-pkgrel=3
+pkgrel=1
 pkgdesc="Application for Scientific Data Analysis and Visualization, fork of QtiPlot. Qt5 port"
 arch=('x86_64')
 url="http://scidavis.sourceforge.net/"
@@ -28,13 +28,13 @@ depends=('gsl' 'glu' 'mesa' 'muparser>=2.3.2' 'shared-mime-info'
 'python-pyqt5-sip'
 'qt5-svg'
 'python' 'python-scipy')
-conflicts=('scidavis')
+conflicts=('scidavis' 'python-sip4')
 source=(
    "${_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=('1ada921f7cdcaf0d36ea3237d7c30b6e9457710e4340eeeb1f2afe6965804613089b5a6994954c48e16702cae86c2a8426b471b5e4c7c64222655c8e0c5e617f'
+sha512sums=('8dd969bd5cb0ae2507e2c511a4c2ff9ba7ab4dca30f45f4807e539bdfa7c7468682aff269817d7046cdc5317ab42cd43e5b66174796425685d3e99016dcbc434'
             'aa63824a62cb4abf15241d35091c697c143ea0185e7efedbf3931c4cb427c5646606e15a6dc1cdeb2e143d6d77476b9fdd877cff3cc797d7439a5cba953a450c'
             '5784fe55b11ee6437b765964b87522dd60a1e84e4424982ca3f3f3c6b09d986c5d5f8f0dfa593d70027f614865261eee27c7827c4d194cbe2f678d60ae4bf0b7')