Fixing pkgver sed range. Compiling in chroot.

3 files changed, 16 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7229160b258f..6b52f3fe5003 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = welle.io-git
 	pkgdesc = An open source DAB and DAB+ software defined radio (SDR) with support for rtl-sdr (RTL2832U) and airspy
-	pkgver = 1.0.r16.e74a22e
+	pkgver = 1.0.r21.0141eb1
 	pkgrel = 1
 	url = https://www.welle.io
 	arch = x86_64
@@ -11,7 +11,6 @@ pkgbase = welle.io-git
 	depends = faad2
 	depends = fftw
 	depends = qt5-charts
-	depends = qt5-declarative
 	depends = qt5-multimedia
 	depends = qt5-quickcontrols
 	depends = qt5-quickcontrols2
diff --git a/.gitignore b/.gitignore
index 1680469c10b6..c32de4816e8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 welle.io-git-*.pkg.tar.xz
+welle.io-git-*.log
+PKGBUILD-namcap.log
 welle.io/
 pkg/
 src/
diff --git a/PKGBUILD b/PKGBUILD
index 5d3c0b058a56..42a4afa6a483 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Daniel Strobl <danielstrobl:gmail>
 
 pkgname=welle.io-git
-pkgver=1.0.r16.e74a22e
+pkgver=1.0.r21.0141eb1
 pkgrel=1
 pkgdesc="An open source DAB and DAB+ software defined radio (SDR) with support for rtl-sdr (RTL2832U) and airspy"
 arch=("x86_64")
 url="https://www.${pkgname%-git}"
 license=("GPL2")
-depends=("faad2" "fftw" "qt5-charts" "qt5-declarative" "qt5-multimedia" "qt5-quickcontrols" "qt5-quickcontrols2" "rtl-sdr")
+depends=("faad2" "fftw" "qt5-charts" "qt5-multimedia" "qt5-quickcontrols" "qt5-quickcontrols2" "rtl-sdr")
 optdepends=("airspy")
 makedepends=("gcc" "cmake" "git")
 provides=("${pkgname%-git}")
@@ -17,29 +17,29 @@ source=("${pkgname%-git}::git://github.com/AlbrechtL/${pkgname%-git}")
 sha256sums=("SKIP")
 
 pkgver() {
-  cd "${pkgname%-git}"
-  git describe --long --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g' | tr -d V
+  cd "${srcdir}/${pkgname%-git}"
+  (
+    set -o pipefail
+    git describe --long --tags 2> /dev/null | sed "s/^[A-Za-z\.\-]*//;s/\([^-]*-\)g/r\1/;s/-/./g" || 
+    printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" 
+  )
 }
 
 build() {
-  mkdir -p "${pkgname%-git}/build"
+  mkdir -p "${srcdir}/${pkgname%-git}/build"
   cd "${pkgname%-git}/build"
   cmake .. -DRTLSDR=1
   make
 }
 
 package() {
-  msg2 "Installing desktop file into /usr/share/applications/"
   install -D -m 0644 "${srcdir}/${pkgname%-git}/${pkgname/%.io-git/-io}.desktop" "${pkgdir}/usr/share/applications/${pkgname/%.io-soapysdr-git/-io}.desktop"
-  
-  msg2 "Installing icon into /usr/share/pixmaps/"
+
   install -D -m 0644 "${srcdir}/${pkgname%-git}/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname/%.io-soapysdr-git/-io}.png"
-  
-  msg2 "Installing application"
-  cd "${pkgname%-git}/build"
+
+  cd "${srcdir}/${pkgname%-git}/build"
   make DESTDIR=${pkgdir} install
-  
-  msg2 "Moving from /usr/local/bin to /usr/bin to match Arch packaging standards"
+
   mv "${pkgdir}/usr/local/"* "${pkgdir}/usr/"
   rm -r "${pkgdir}/usr/local"
 }