upgpkg: direwolf-git 1.5.beta4.r136.g909b703-1

3 files changed, 5 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74acf3755702..f7225403665e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = direwolf-git
 	pkgdesc = Software modem/TNC and APRS encoder/decoder
-	pkgver = 1.5.beta4.r112.ge54b851
-	pkgrel = 2
+	pkgver = 1.5.beta4.r136.g909b703
+	pkgrel = 1
 	url = https://github.com/wb2osz/direwolf
 	arch = i686
 	arch = x86_64
@@ -16,15 +16,12 @@ pkgbase = direwolf-git
 	provides = direwolf
 	conflicts = direwolf
 	source = git+https://github.com/wb2osz/direwolf.git#branch=dev
-	source = 0002-Fix-gpsd-version-error.patch
 	source = direwolf.service
 	source = direwolf-kiss.service
 	sha1sums = SKIP
-	sha1sums = be4921815da1b631c6b22d362dd03a184cf5ce8a
 	sha1sums = 66366c7a4e8d3768013f9036f2681a86d4b8ad88
 	sha1sums = eea3a3fb334645cd8a1e2604dc6c6b024148722a
 	sha256sums = SKIP
-	sha256sums = 402378a290a0e1ed29a0bbde3b921a16e4a85913eed25b215fe62bf6dedbc0d0
 	sha256sums = a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a
 	sha256sums = 2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68
 
diff --git a/0002-Fix-gpsd-version-error.patch b/0002-Fix-gpsd-version-error.patch
deleted file mode 100644
index 49080f0befa2..000000000000
--- a/0002-Fix-gpsd-version-error.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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 770beb99b1a0..59797b6d8484 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Alexander Fasching <fasching.a91@gmail.com>
 pkgname=direwolf-git
 _pkgname=direwolf
-pkgver=1.5.beta4.r112.ge54b851
-pkgrel=2
+pkgver=1.5.beta4.r136.g909b703
+pkgrel=1
 pkgdesc="Software modem/TNC and APRS encoder/decoder"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="https://github.com/wb2osz/direwolf"
@@ -12,15 +12,12 @@ makedepends=('git' 'cmake')
 provides=('direwolf')
 conflicts=('direwolf')
 source=('git+https://github.com/wb2osz/direwolf.git#branch=dev'
-        '0002-Fix-gpsd-version-error.patch'
         'direwolf.service'
         'direwolf-kiss.service')
 sha1sums=('SKIP'
-          'be4921815da1b631c6b22d362dd03a184cf5ce8a'
           '66366c7a4e8d3768013f9036f2681a86d4b8ad88'
           'eea3a3fb334645cd8a1e2604dc6c6b024148722a')
 sha256sums=('SKIP'
-            '402378a290a0e1ed29a0bbde3b921a16e4a85913eed25b215fe62bf6dedbc0d0'
             'a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a'
             '2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68')
 
@@ -31,7 +28,7 @@ pkgver() {
 
 prepare() {
     cd "$_pkgname"
-    git apply ../0002-Fix-gpsd-version-error.patch
+    # Currently no patches necessary.
 }
 
 build() {