Bumped version to 1.7

3 files changed, 8 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1357bf99aeea..c69dfb2dbbfd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = direwolf
 	pkgdesc = Dire Wolf is a software modem/TNC and APRS encoder/decoder
-	pkgver = 1.6
+	pkgver = 1.7
 	pkgrel = 1
 	url = https://github.com/wb2osz/direwolf
 	arch = i686
@@ -13,16 +13,13 @@ pkgbase = direwolf
 	makedepends = patch
 	depends = alsa-lib
 	depends = gpsd
-	source = direwolf-1.6.tar.gz::https://github.com/wb2osz/direwolf/archive/refs/tags/1.6.tar.gz
-	source = dwgpsd.patch
+	source = direwolf-1.7.tar.gz::https://github.com/wb2osz/direwolf/archive/refs/tags/1.7.tar.gz
 	source = direwolf.service
 	source = direwolf-kiss.service
-	sha1sums = 4290155b96289409a6d3a0a93cf9eb821829136e
-	sha1sums = 5e77ccc6d861a60fb73c9c16423cf4894e1434e2
+	sha1sums = a0dd836c682f6162d88ed5650eb6156a5ef4dcd0
 	sha1sums = 66366c7a4e8d3768013f9036f2681a86d4b8ad88
 	sha1sums = eea3a3fb334645cd8a1e2604dc6c6b024148722a
-	sha256sums = 208b0563c9b339cbeb0e1feb52dc18ae38295c40c0009d6381fc4acb68fdf660
-	sha256sums = 8cacecc740bf067bec8f6daa834f591ca02da54a85cdf4367e2e827a8758df22
+	sha256sums = 6301f6a43e5db9ef754765875592a58933f6b78585e9272afc850acf7c5914be
 	sha256sums = a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a
 	sha256sums = 2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68
 
diff --git a/PKGBUILD b/PKGBUILD
index 613da94a2ae3..d6b51461faf0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Wijnand Modderman-Lenstra <maze@pyth0n.org>
 pkgname=direwolf
-pkgver=1.6
+pkgver=1.7
 pkgrel=1
 pkgdesc="Dire Wolf is a software modem/TNC and APRS encoder/decoder"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
@@ -9,23 +9,19 @@ license=('GPL')
 depends=('alsa-lib' 'gpsd')
 makedepends=('cmake' 'gcc' 'patch')
 source=(
-    "$pkgname-$pkgver.tar.gz::https://github.com/wb2osz/direwolf/archive/refs/tags/1.6.tar.gz"
-    'dwgpsd.patch'
+    "$pkgname-$pkgver.tar.gz::https://github.com/wb2osz/direwolf/archive/refs/tags/1.7.tar.gz"
     'direwolf.service'
     'direwolf-kiss.service'
 )
-sha1sums=('4290155b96289409a6d3a0a93cf9eb821829136e'
-          '5e77ccc6d861a60fb73c9c16423cf4894e1434e2'
+sha1sums=('a0dd836c682f6162d88ed5650eb6156a5ef4dcd0'
           '66366c7a4e8d3768013f9036f2681a86d4b8ad88'
           'eea3a3fb334645cd8a1e2604dc6c6b024148722a')
-sha256sums=('208b0563c9b339cbeb0e1feb52dc18ae38295c40c0009d6381fc4acb68fdf660'
-            '8cacecc740bf067bec8f6daa834f591ca02da54a85cdf4367e2e827a8758df22'
+sha256sums=('6301f6a43e5db9ef754765875592a58933f6b78585e9272afc850acf7c5914be'
             'a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a'
             '2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68')
 
 prepare() {
     cd "$pkgname-$pkgver"
-    patch -p1 < "$srcdir/dwgpsd.patch"
 }
 
 build() {
diff --git a/dwgpsd.patch b/dwgpsd.patch
deleted file mode 100644
index 19ec3f648196..000000000000
--- a/dwgpsd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/dwgpsd.c	2023-02-03 21:06:45.638141888 +0100
-+++ b/src/dwgpsd.c	2023-02-03 21:07:43.755376011 +0100
-@@ -60,7 +60,8 @@
- // An incompatibility was introduced with version 7
- // and again with 9 and again with 10.
- 
--#if GPSD_API_MAJOR_VERSION < 5 || GPSD_API_MAJOR_VERSION > 11
-+#if GPSD_API_MAJOR_VERSION < 5 \
-+    || (GPSD_API_MAJOR_VERSION == 5 && GPSD_API_MAJOR_VERSION > 11)
- #error libgps API version might be incompatible.
- #endif
-