Upstream version 3.1.3

3 files changed, 29 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3783fc8f1bde..0ab02974348d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,25 @@
 pkgbase = atsas
 	pkgdesc = A program suite for small-angle scattering data analysis from biological macromolecules
-	pkgver = 3.0.4
-	pkgrel = 2
+	pkgver = 3.1.3
+	pkgrel = 1
 	url = https://www.embl-hamburg.de/biosaxs/software.html
 	install = install
 	arch = x86_64
 	license = custom
 	depends = libgfortran.so=5
+	depends = qt5-base
+	depends = qt5-tools
+	depends = qt5-svg
 	options = !strip
-	source = local://ATSAS-3.0.4-2_amd64.tar.gz
+	source = local://ATSAS-3.1.3-1_amd64.tar.gz
 	source = license.md
 	source = atsas.sh
 	source = atsas.fish
 	source = atsas.csh
-	sha512sums = aa82405268efb3f948609d930aac8a43be9c138e25e892b672054cf7cf010be4ed3f10f158c4bc418084f690a261758d9aa32e395d72638d822533a348b430e7
+	sha512sums = 78e413557fbeb1d6a5f191f9e323f8cb1573d2235ed13d854591f056fd806a61137ad18e17927fd05606744dc6e340dae903c274fb47823a325dbe43513a9e3c
 	sha512sums = 3f728fb538b236f0ddce8a7c86303d14c529da4f117eb5f4c87ef5f0fef52dea3ae7650fc439316c08628dc641893ab10f85890577fcb8e67b9398fdbbfa773f
-	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = SKIP
+	sha512sums = 293ce54e3ec40b2b9173e123a9a98027b69859b28bf970d91d6ace3ae60d30a00e7c2e89fc02755874967a6e34446ea32084a9335bf2f3b41aa30458f7fcfd54
+	sha512sums = 5c654541e4a778ac2e27bccb8952bbeff79cb5f11339b705b26eb9d4d2c31511bdbc3ecfd31bbe538c82a725617ff1053a0536f81b9231e972e5947010ed74c0
+	sha512sums = 0dba1e27b46fbbb272c4afeef06368c99ae28eb6686c6cfc6fe68169f9729a6d63a039a8909cbf17d1eca756ef471c675c438d10749ee35024ddb6579139fdca
 
 pkgname = atsas
diff --git a/.gitignore b/.gitignore
index 4668daa379c9..4585cbbbb009 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ pkg/
 ATSAS*.tar.gz
 *~
 *.pkg.tar.xz
-*.log
\ No newline at end of file
+*.pkg.tar.zst
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index 9a6a13055b45..650afad8bed2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,25 @@
 # Maintainer: András Wacha <awacha@gmail.com>
 pkgname=atsas
-pkgver=3.0.4
-pkgrel_upstream=2
-pkgrel=2
+pkgver=3.1.3
+_pkgrel_upstream=1
+pkgrel=1
 pkgdesc="A program suite for small-angle scattering data analysis from biological macromolecules"
 arch=('x86_64')
 url="https://www.embl-hamburg.de/biosaxs/software.html"
 license=('custom')
 options=('!strip')
-depends=( 'libgfortran.so=5' )
+depends=( 'libgfortran.so=5' 'qt5-base' 'qt5-tools' 'qt5-svg' )
 install=install
 
 # !!! You have to download the sources yourself from https://www.embl-hamburg.de/biosaxs/download.html
-# !!! Use the Ubuntu-20.04 version!
+# !!! Use the Ubuntu-22.04 version!
 
-source=("local://ATSAS-${pkgver}-${pkgrel_upstream}_amd64.tar.gz" 'license.md' 'atsas.sh' 'atsas.fish' 'atsas.csh')
-sha512sums=('aa82405268efb3f948609d930aac8a43be9c138e25e892b672054cf7cf010be4ed3f10f158c4bc418084f690a261758d9aa32e395d72638d822533a348b430e7'
+source=("local://ATSAS-${pkgver}-${_pkgrel_upstream}_amd64.tar.gz" 'license.md' 'atsas.sh' 'atsas.fish' 'atsas.csh')
+sha512sums=('78e413557fbeb1d6a5f191f9e323f8cb1573d2235ed13d854591f056fd806a61137ad18e17927fd05606744dc6e340dae903c274fb47823a325dbe43513a9e3c'
             '3f728fb538b236f0ddce8a7c86303d14c529da4f117eb5f4c87ef5f0fef52dea3ae7650fc439316c08628dc641893ab10f85890577fcb8e67b9398fdbbfa773f'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-)
+            '293ce54e3ec40b2b9173e123a9a98027b69859b28bf970d91d6ace3ae60d30a00e7c2e89fc02755874967a6e34446ea32084a9335bf2f3b41aa30458f7fcfd54'
+            '5c654541e4a778ac2e27bccb8952bbeff79cb5f11339b705b26eb9d4d2c31511bdbc3ecfd31bbe538c82a725617ff1053a0536f81b9231e972e5947010ed74c0'
+            '0dba1e27b46fbbb272c4afeef06368c99ae28eb6686c6cfc6fe68169f9729a6d63a039a8909cbf17d1eca756ef471c675c438d10749ee35024ddb6579139fdca')
 
 
 package() {
@@ -29,8 +28,14 @@ package() {
 	ATSAS_ROOT=/opt/ATSAS
 	mkdir -p "${pkgdir}${ATSAS_ROOT}"
 	ln -s ATSAS "${pkgdir}/opt/atsas"
-	cd "${srcdir}/ATSAS-${pkgver}-${pkgrel_upstream}" 
+	cd "${srcdir}/ATSAS-${pkgver}-${_pkgrel_upstream}" 
 	cp -R * "${pkgdir}${ATSAS_ROOT}/"
+	# remove the supplied Qt5 libraries: use the system-wide ones.
+	rm "${pkgdir}${ATSAS_ROOT}"/lib/atsas/libQt5*
+#	rm "${pkgdir}${ATSAS_ROOT}"/lib/atsas/libqwt*
+	rm -r "${pkgdir}${ATSAS_ROOT}/bin/platforms"
+
+
 #	DEST_BIN_DIR="$ATSAS_ROOT/bin"
 #	GCC7_LIBDIR=$(ls -d /usr/lib/gcc/${CHOST}/7.*)
 #	echo "GCC7 libdir: ${GCC7_LIBDIR}"