Update to version 4.0.1

2 files changed, 18 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d17f39ea780b..8828dcf6b868 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-ginga
 	pkgdesc = A viewer for astronomical data FITS (Flexible Image Transport System) files.
-	pkgver = 3.4.1
+	pkgver = 4.0.1
 	pkgrel = 1
 	url = https://ejeschke.github.io/ginga
 	arch = any
@@ -10,21 +10,22 @@ pkgbase = python-ginga
 	checkdepends = python-pillow
 	checkdepends = python-scipy
 	checkdepends = python-astlib
+	checkdepends = python-starlink-pyast
 	makedepends = python-setuptools-scm
 	makedepends = python-wheel
 	makedepends = python-build
 	makedepends = python-installer
-	source = https://files.pythonhosted.org/packages/source/g/ginga/ginga-3.4.1.tar.gz
-	md5sums = e2f781b962b73a3001ba65710c10d186
+	source = https://files.pythonhosted.org/packages/source/g/ginga/ginga-4.0.1.tar.gz
+	md5sums = 4fb8b5ba37dbf9fa52f57da0fe4fdd96
 
 pkgname = python-ginga
 	depends = python-astropy>=3.2
 	depends = python-qtpy>=2.0.1
-	depends = python-pillow>=3.2.0
+	depends = python-pillow>=6.2.1
 	depends = python-importlib-metadata
 	optdepends = python-scipy>=0.18.1: required by Pick, some built-in auto cuts algorithms used when you load an image
 	optdepends = python-matplotlib>=2.1: required by Pick, Cuts, Histogram, LineProfile
-	optdepends = python-opencv>=4.5.4.58: recommended
+	optdepends = python-opencv>=4.5.4.58: speeds up rotation, mosaicing and some transformations
 	optdepends = python-exifread>=2.3.2: recommended
 	optdepends = python-beautifulsoup4>=4.3.2
 	optdepends = python-astroquery>=0.3.5: required by Catalogs
@@ -32,6 +33,7 @@ pkgname = python-ginga
 	optdepends = python-photutils
 	optdepends = python-fitsio: for opening FITS files
 	optdepends = python-astlib: for WCS resolution
+	optdepends = python-starlink-pyast: for WCS resolution
 	optdepends = python-cairo: for gtk3 backend
 	optdepends = python-gobject: for gtk3 backend
 	optdepends = python-pyqt5: for qt5 backend
diff --git a/PKGBUILD b/PKGBUILD
index d80dcfa48f3b..b5f5712582fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=python-ginga
 _pyname=${pkgname#python-}
-pkgver=3.4.1
+pkgver=4.0.1
 pkgrel=1
 pkgdesc="A viewer for astronomical data FITS (Flexible Image Transport System) files."
 arch=('any')
@@ -17,15 +17,15 @@ checkdepends=('python-pytest-astropy-header'
               'python-photutils'
               'python-pillow'
               'python-scipy'
-              'python-astlib')
+              'python-astlib'
+              'python-starlink-pyast')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-md5sums=('e2f781b962b73a3001ba65710c10d186')
+md5sums=('4fb8b5ba37dbf9fa52f57da0fe4fdd96')
 
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
     sed -i "/ignore:distutils/a \	ignore:the imp module is deprecated:DeprecationWarning" setup.cfg
-    sed -i "/Exec/a Icon=ginga" ginga.desktop
 }
 
 build() {
@@ -43,11 +43,11 @@ check() {
 package() {
     depends=('python-astropy>=3.2'
              'python-qtpy>=2.0.1'
-             'python-pillow>=3.2.0'
+             'python-pillow>=6.2.1'
              'python-importlib-metadata')
     optdepends=('python-scipy>=0.18.1: required by Pick, some built-in auto cuts algorithms used when you load an image'
                 'python-matplotlib>=2.1: required by Pick, Cuts, Histogram, LineProfile'
-                'python-opencv>=4.5.4.58: recommended'
+                'python-opencv>=4.5.4.58: speeds up rotation, mosaicing and some transformations'
                 'python-exifread>=2.3.2: recommended'
                 'python-beautifulsoup4>=4.3.2'
                 'python-astroquery>=0.3.5: required by Catalogs'
@@ -55,6 +55,7 @@ package() {
                 'python-photutils'
                 'python-fitsio: for opening FITS files'
                 'python-astlib: for WCS resolution'
+                'python-starlink-pyast: for WCS resolution'
                 'python-cairo: for gtk3 backend'
                 'python-gobject: for gtk3 backend'
                 'python-pyqt5: for qt5 backend'
@@ -64,10 +65,10 @@ package() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
     install -D -m644 -t "${pkgdir}/usr/share/applications/${pkgname}" ${_pyname}.desktop
-    install -d -m644 "${pkgdir}/usr/share/icons/hicolor/512x512/apps"
-    install -m644 ${_pyname}/icons/${_pyname}-512x512.png \
-        "${pkgdir}/usr/share/icons/hicolor/512x512/apps/${_pyname}.png"
-    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE.txt
+    install -d -m644 "${pkgdir}/usr/share/icons/hicolor/scalable/apps"
+    install -m644 ${_pyname}/icons/${_pyname}.svg \
+        "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pyname}.svg"
+    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE.txt licenses/*
     install -D -m644 -t "${pkgdir}/usr/share/doc/${pkgname}" README.md
     python -m installer --destdir="${pkgdir}" dist/*.whl
 }