upgpkg: direwolf-git 1.5.beta4.r106.g1f2a5cf-1

Add patch to fix gpsd build error

3 files changed, 26 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b7c46da9d1aa..5e5444fadaa9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = direwolf-git
 	pkgdesc = Software modem/TNC and APRS encoder/decoder
-	pkgver = 1.5.beta4.r105.gf08ed51
+	pkgver = 1.5.beta4.r106.g1f2a5cf
 	pkgrel = 1
 	url = https://github.com/wb2osz/direwolf
 	arch = i686
@@ -17,14 +17,17 @@ pkgbase = direwolf-git
 	conflicts = direwolf
 	source = git+https://github.com/wb2osz/direwolf.git#branch=dev
 	source = 0001-Add-build-option-for-udev-path.patch
+	source = 0002-Fix-gpsd-version-error.patch
 	source = direwolf.service
 	source = direwolf-kiss.service
 	sha1sums = SKIP
 	sha1sums = c768819622aa10092a1dc3481e4f2340b9674593
+	sha1sums = be4921815da1b631c6b22d362dd03a184cf5ce8a
 	sha1sums = 66366c7a4e8d3768013f9036f2681a86d4b8ad88
 	sha1sums = eea3a3fb334645cd8a1e2604dc6c6b024148722a
 	sha256sums = SKIP
 	sha256sums = 3c80f0350df3959a759906722837514aedb0488e008a6ba5081cd727fce7e2ad
+	sha256sums = 402378a290a0e1ed29a0bbde3b921a16e4a85913eed25b215fe62bf6dedbc0d0
 	sha256sums = a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a
 	sha256sums = 2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68
 
diff --git a/0002-Fix-gpsd-version-error.patch b/0002-Fix-gpsd-version-error.patch
new file mode 100644
index 000000000000..49080f0befa2
--- /dev/null
+++ b/0002-Fix-gpsd-version-error.patch
@@ -0,0 +1,17 @@
+diff --git a/src/dwgpsd.c b/src/dwgpsd.c
+index 890dd50..a7a39a2 100644
+--- a/src/dwgpsd.c
++++ b/src/dwgpsd.c
+@@ -59,12 +59,6 @@
+ // dwgps.c claims to only support GPSD_API_MAJOR_VERSION 5, but also builds successfully with
+ // GPSD_API_MAJOR_VERSION 6 provided by libgps22 when the attached patch is applied.
+ 
+-// Also compatible with API 7 & 8 with conditional compilation later.
+-
+-#if GPSD_API_MAJOR_VERSION < 5 || GPSD_API_MAJOR_VERSION > 8
+-#error libgps API version might be incompatible.
+-#endif
+-
+ /*
+  * Information for interface to gpsd daemon.
+  */
diff --git a/PKGBUILD b/PKGBUILD
index 1e3b8f50eb03..0e28cd513ca6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexander Fasching <fasching.a91@gmail.com>
 pkgname=direwolf-git
 _pkgname=direwolf
-pkgver=1.5.beta4.r105.gf08ed51
+pkgver=1.5.beta4.r106.g1f2a5cf
 pkgrel=1
 pkgdesc="Software modem/TNC and APRS encoder/decoder"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
@@ -13,14 +13,17 @@ provides=('direwolf')
 conflicts=('direwolf')
 source=('git+https://github.com/wb2osz/direwolf.git#branch=dev'
         '0001-Add-build-option-for-udev-path.patch'
+        '0002-Fix-gpsd-version-error.patch'
         'direwolf.service'
         'direwolf-kiss.service')
 sha1sums=('SKIP'
           'c768819622aa10092a1dc3481e4f2340b9674593'
+          'be4921815da1b631c6b22d362dd03a184cf5ce8a'
           '66366c7a4e8d3768013f9036f2681a86d4b8ad88'
           'eea3a3fb334645cd8a1e2604dc6c6b024148722a')
 sha256sums=('SKIP'
             '3c80f0350df3959a759906722837514aedb0488e008a6ba5081cd727fce7e2ad'
+            '402378a290a0e1ed29a0bbde3b921a16e4a85913eed25b215fe62bf6dedbc0d0'
             'a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a'
             '2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68')
 
@@ -32,6 +35,7 @@ pkgver() {
 prepare() {
     cd "$_pkgname"
     git apply ../0001-Add-build-option-for-udev-path.patch
+    git apply ../0002-Fix-gpsd-version-error.patch
 }
 
 build() {