Fix location of librtlsdr.so

3 files changed, 50 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f125ef9be02d..06c6b606d97f 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 = 2
+	pkgrel = 3
 	url = https://www.sdr-j.tk/
 	arch = x86_64
 	license = GPL2
@@ -19,6 +19,8 @@ pkgbase = qt-dab
 	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
 
 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
new file mode 100644
index 000000000000..709136fe66a8
--- /dev/null
+++ b/0001-Fix-location-of-librtlsdr.so-on-Arch-Linux.patch
@@ -0,0 +1,39 @@
+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 e7dd10c3224c..5a94da53ff64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=qt-dab
 pkgver=6.2.5
-pkgrel=2
+pkgrel=3
 _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
@@ -24,12 +24,17 @@ optdepends=('airspy: Support for Airspy'
             '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")
-sha256sums=('631740f711f3736eb94ace7588d6187f4d3a33547656e00df05a2487dadab9b9')
+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')
 
 prepare() {
 	cd "${_prefix}${_tagname}${_pkgver}"
 
+	# Fix location of librtlsdr.so
+	patch -p1 < "${srcdir}/0001-Fix-location-of-librtlsdr.so-on-Arch-Linux.patch"
+
 	# The program is officially called Qt-DAB.
 	sed -i 's/Qt_DAB/Qt-DAB/g' ${_fullname_s}/${_fullname}.desktop
 }