Update to 6.30

3 files changed, 13 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 06c6b606d97f..53eed4b3dd6f 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.2.5
-	pkgrel = 3
+	pkgver = 6.3
+	pkgrel = 1
 	url = https://www.sdr-j.tk/
 	arch = x86_64
 	license = GPL2
@@ -18,9 +18,9 @@ pkgbase = qt-dab
 	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.25.tar.gz
-	source = 0001-Fix-location-of-librtlsdr.so-on-Arch-Linux.patch
-	sha256sums = 631740f711f3736eb94ace7588d6187f4d3a33547656e00df05a2487dadab9b9
-	sha256sums = 49862b828def591a9cf2dff43667ee5efcb2174df7f9d0fb4a636b90d11f4b3d
+	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
 
 pkgname = qt-dab
diff --git a/0001-Fix-location-of-librtlsdr.so-on-Arch-Linux.patch b/0001-Fix-location-of-librtlsdr.so-on-Arch-Linux.patch
deleted file mode 100644
index 709136fe66a8..000000000000
--- a/0001-Fix-location-of-librtlsdr.so-on-Arch-Linux.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c54190bcc9008bf3c887952e9234ff094bdc5350 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20La=C3=9F?= <bevan@bi-co.net>
-Date: Wed, 8 Nov 2023 20:27:52 +0100
-Subject: [PATCH] Fix location of librtlsdr.so on Arch Linux
-
----
- qt-devices/rtlsdr-handler-generic/rtlsdr-handler.cpp | 2 +-
- qt-devices/rtlsdr-handler-linux/rtlsdr-handler.cpp   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/qt-devices/rtlsdr-handler-generic/rtlsdr-handler.cpp b/qt-devices/rtlsdr-handler-generic/rtlsdr-handler.cpp
-index b98f6c3..40e5d14 100755
---- a/qt-devices/rtlsdr-handler-generic/rtlsdr-handler.cpp
-+++ b/qt-devices/rtlsdr-handler-generic/rtlsdr-handler.cpp
-@@ -150,7 +150,7 @@ char	manufac [256], product [256], serial [256];
- #ifdef	__MINGW32__
- 	const char *libraryString	= "rtlsdr.dll";
- #elif __linux__
--	const char *libraryString	= "/usr/local/lib64/librtlsdr.so";
-+	const char *libraryString	= "/usr/lib/librtlsdr.so";
- #elif __APPLE__
- 	const char *libraryString	= "librtlsdr.dylib";
- #endif
-diff --git a/qt-devices/rtlsdr-handler-linux/rtlsdr-handler.cpp b/qt-devices/rtlsdr-handler-linux/rtlsdr-handler.cpp
-index 546ec24..80ae1c0 100755
---- a/qt-devices/rtlsdr-handler-linux/rtlsdr-handler.cpp
-+++ b/qt-devices/rtlsdr-handler-linux/rtlsdr-handler.cpp
-@@ -150,7 +150,7 @@ char	manufac [256], product [256], serial [256];
- #ifdef	__MINGW32__
- 	const char *libraryString	= "librtlsdr.dll";
- #elif __linux__
--	const char *libraryString	= "/usr/local/lib64/librtlsdr.so";
-+	const char *libraryString	= "/usr/lib/librtlsdr.so";
- #elif __APPLE__
-     const char *libraryString	= "librtlsdr.dylib";
- #endif
--- 
-2.42.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 5a94da53ff64..ee8f21c81a22 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,11 +4,11 @@
 # https://github.com/michaellass/AUR
 
 pkgname=qt-dab
-pkgver=6.2.5
-pkgrel=3
+pkgver=6.3
+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.25
+_pkgver=6.30
 _major=${pkgver::1}
 _fullname=${pkgname}-${_major}
 _fullname_s=${pkgname}-s${_major}
@@ -25,15 +25,14 @@ optdepends=('airspy: Support for Airspy'
             'rtl-sdr: Support for RTL-SDR'
             'libsdrplay: Support for SDRplay')
 source=("https://github.com/JvanKatwijk/${pkgname}/archive/refs/tags/${_tagname}${_pkgver}.tar.gz"
-        0001-Fix-location-of-librtlsdr.so-on-Arch-Linux.patch)
-sha256sums=('631740f711f3736eb94ace7588d6187f4d3a33547656e00df05a2487dadab9b9'
-            '49862b828def591a9cf2dff43667ee5efcb2174df7f9d0fb4a636b90d11f4b3d')
+        https://github.com/JvanKatwijk/qt-dab/commit/f260ae6ecba97a9e83bbbb7f1471286d5a8cf3ca.patch)
+sha256sums=('bea7ecfa7f58e6bb41bc8eaa2159f6ee84ee1a6feba9ef598c33bf37b3cfe903'
+            '53ddb4dfb36830720529d8846d420c96f543b29ffa858454129dd5fa6e5b72b5')
 
 prepare() {
 	cd "${_prefix}${_tagname}${_pkgver}"
 
-	# Fix location of librtlsdr.so
-	patch -p1 < "${srcdir}/0001-Fix-location-of-librtlsdr.so-on-Arch-Linux.patch"
+	patch -p1 < "${srcdir}/f260ae6ecba97a9e83bbbb7f1471286d5a8cf3ca.patch"
 
 	# The program is officially called Qt-DAB.
 	sed -i 's/Qt_DAB/Qt-DAB/g' ${_fullname_s}/${_fullname}.desktop