Update to 6.40

2 files changed, 12 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb6339d6dc38..0386487733c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qt-dab
 	pkgdesc = Software DAB decoder for use with various SDR devices (formerly dab-maxi)
-	pkgver = 6.3
-	pkgrel = 2
+	pkgver = 6.4
+	pkgrel = 1
 	url = https://www.sdr-j.tk/
 	arch = x86_64
 	license = GPL2
@@ -12,15 +12,14 @@ pkgbase = qt-dab
 	depends = libsndfile
 	depends = portaudio
 	depends = qwt
+	depends = zlib
 	optdepends = airspy: Support for Airspy
 	optdepends = hackrf: Support for HackRF
 	optdepends = limesuite: Support for LimeSDR
 	optdepends = libad9361: Support for Pluto
 	optdepends = rtl-sdr: Support for RTL-SDR
 	optdepends = libsdrplay: Support for SDRplay
-	source = https://github.com/JvanKatwijk/qt-dab/archive/refs/tags/qt-dab-6.30.tar.gz
-	source = https://github.com/JvanKatwijk/qt-dab/commit/f260ae6ecba97a9e83bbbb7f1471286d5a8cf3ca.patch
-	sha256sums = bea7ecfa7f58e6bb41bc8eaa2159f6ee84ee1a6feba9ef598c33bf37b3cfe903
-	sha256sums = 53ddb4dfb36830720529d8846d420c96f543b29ffa858454129dd5fa6e5b72b5
+	source = https://github.com/JvanKatwijk/qt-dab/archive/refs/tags/qt-dab-6.40.tar.gz
+	sha256sums = 78195166cfe67f9a4ac229bfdcded284b3f88b8af3e449ac91406cc93e1e4c07
 
 pkgname = qt-dab
diff --git a/PKGBUILD b/PKGBUILD
index 1de85fe2ec0c..1dea76c7b401 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,11 +4,11 @@
 # https://github.com/michaellass/AUR
 
 pkgname=qt-dab
-pkgver=6.3
-pkgrel=2
+pkgver=6.4
+pkgrel=1
 _prefix=qt-dab-  # name of tarball and contents change from release to release
 _tagname=qt-dab- # tag names may differ from the application version
-_pkgver=6.30
+_pkgver=6.40
 _major=${pkgver::1}
 _fullname=${pkgname}-${_major}
 _fullname_s=${pkgname}-s${_major}
@@ -17,23 +17,19 @@ pkgdesc="Software DAB decoder for use with various SDR devices (formerly dab-max
 arch=(x86_64)
 url="https://www.sdr-j.tk/"
 license=('GPL2')
-depends=(faad2 fftw hicolor-icon-theme libsamplerate libsndfile portaudio qwt)
+depends=(faad2 fftw hicolor-icon-theme libsamplerate libsndfile portaudio qwt zlib)
 optdepends=('airspy: Support for Airspy'
             'hackrf: Support for HackRF'
             'limesuite: Support for LimeSDR'
             'libad9361: Support for Pluto'
             'rtl-sdr: Support for RTL-SDR'
             'libsdrplay: Support for SDRplay')
-source=("https://github.com/JvanKatwijk/${pkgname}/archive/refs/tags/${_tagname}${_pkgver}.tar.gz"
-        https://github.com/JvanKatwijk/qt-dab/commit/f260ae6ecba97a9e83bbbb7f1471286d5a8cf3ca.patch)
-sha256sums=('bea7ecfa7f58e6bb41bc8eaa2159f6ee84ee1a6feba9ef598c33bf37b3cfe903'
-            '53ddb4dfb36830720529d8846d420c96f543b29ffa858454129dd5fa6e5b72b5')
+source=("https://github.com/JvanKatwijk/${pkgname}/archive/refs/tags/${_tagname}${_pkgver}.tar.gz")
+sha256sums=('78195166cfe67f9a4ac229bfdcded284b3f88b8af3e449ac91406cc93e1e4c07')
 
 prepare() {
 	cd "${_prefix}${_tagname}${_pkgver}"
 
-	patch -p1 < "${srcdir}/f260ae6ecba97a9e83bbbb7f1471286d5a8cf3ca.patch"
-
 	# The program is officially called Qt-DAB.
 	sed -i 's/Qt_DAB/Qt-DAB/g' ${_fullname_s}/${_fullname}.desktop
 }
@@ -58,11 +54,7 @@ build() {
 package() {
 	install -Dm 755 build/${_binary} "${pkgdir}"/usr/bin/${_fullname}
 	install -Dm 644 ${_prefix}${_tagname}${_pkgver}/${_fullname_s}/${_fullname}.desktop "${pkgdir}"/usr/share/applications/${_fullname}.desktop
-	if [ $_major -gt 5 ]; then
-		install -Dm 644 ${_prefix}${_tagname}${_pkgver}/${_fullname}.png "${pkgdir}"/usr/share/icons/hicolor/256x256/apps/${_fullname}.png
-	else
-		install -Dm 644 ${_prefix}${_tagname}${_pkgver}/${_fullname_s}/${_fullname}.png "${pkgdir}"/usr/share/icons/hicolor/256x256/apps/${_fullname}.png
-	fi
+	install -Dm 644 ${_prefix}${_tagname}${_pkgver}/${_fullname_s}/${_fullname}.png "${pkgdir}"/usr/share/icons/hicolor/256x256/apps/${_fullname}.png
 
 	if [ $_major -gt 4 ]; then
 		install -Dm 644 ${_prefix}${_tagname}${_pkgver}/docs/manual-${_major}.pdf "${pkgdir}"/usr/share/doc/${pkgname}/manual.pdf