Fix build error with latest gpsd

4 files changed, 63 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0004bb07c30d..90255d1b3250 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = direwolf-git
-	pkgdesc = Dire Wolf is a software modem/TNC and APRS encoder/decoder
-	pkgver = 1.4.dev.E.r12.gb6254da
+	pkgdesc = Software modem/TNC and APRS encoder/decoder
+	pkgver = 1.5.beta4.r8.gda0a33e
 	pkgrel = 1
 	url = https://github.com/wb2osz/direwolf
 	arch = i686
@@ -16,15 +16,18 @@ pkgbase = direwolf-git
 	provides = direwolf
 	conflicts = direwolf
 	source = git+https://github.com/wb2osz/direwolf.git#branch=dev
-	source = Makefile.patch
+	source = 0001-Makefile.patch
+	source = 0002-Fix-build-error-with-latest-gpsd.patch
 	source = direwolf.service
 	source = direwolf-kiss.service
 	sha1sums = SKIP
-	sha1sums = f94b193a8e49bae073de3cedff4394821d6148fa
+	sha1sums = 8fd025e2df746a4c776c482f04ce93791aad01f6
+	sha1sums = 7100a8a99a2e934e16372c70b18b86453a6266ad
 	sha1sums = 66366c7a4e8d3768013f9036f2681a86d4b8ad88
 	sha1sums = eea3a3fb334645cd8a1e2604dc6c6b024148722a
 	sha256sums = SKIP
-	sha256sums = 5a4bee3543da1bbe9cd8bd5edb3bb9b502728841c4c34da332a19f34f876a140
+	sha256sums = d3f93a6cabe348d410c630f612dd49373f9932f747588dfd915283f3167e2a48
+	sha256sums = eee5554700a2aaded8f4cc9bd0a635d7697280267db9b319ca727c32b07ce5a4
 	sha256sums = a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a
 	sha256sums = 2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68
 
diff --git a/Makefile.patch b/0001-Makefile.patch
index f6c110091f1e..f6c110091f1e 100644
--- a/Makefile.patch
+++ b/0001-Makefile.patch
diff --git a/0002-Fix-build-error-with-latest-gpsd.patch b/0002-Fix-build-error-with-latest-gpsd.patch
new file mode 100644
index 000000000000..9712a0798761
--- /dev/null
+++ b/0002-Fix-build-error-with-latest-gpsd.patch
@@ -0,0 +1,47 @@
+From 55e8ec463b52a6eb867e6e56c296facf6624a208 Mon Sep 17 00:00:00 2001
+From: Alexander Fasching <fasching.a91@gmail.com>
+Date: Sat, 17 Nov 2018 19:32:46 +0100
+Subject: [PATCH 1/1] Fix build error with latest gpsd
+
+---
+ dwgpsd.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/dwgpsd.c b/dwgpsd.c
+index 5709497..dab4fd1 100644
+--- a/dwgpsd.c
++++ b/dwgpsd.c
+@@ -57,9 +57,9 @@
+ // Debian bug report:  direwolf (1.2-1) FTBFS with libgps22 as part of the gpsd transition (#803605):
+ // 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.
+-#if GPSD_API_MAJOR_VERSION < 5 || GPSD_API_MAJOR_VERSION > 6
+-#error libgps API version might be incompatible.
+-#endif
++//#if GPSD_API_MAJOR_VERSION < 5 || GPSD_API_MAJOR_VERSION > 6
++//#error libgps API version might be incompatible.
++//#endif
+ 
+ /*
+  * Information for interface to gpsd daemon.
+@@ -257,7 +257,7 @@ static void * read_gpsd_thread (void *arg)
+ 	    /* Fall thru to read which should get error and bail out. */
+ 	  }
+ 
+-	  if (gps_read (&gpsdata) == -1) {
++	  if (gps_read (&gpsdata, NULL, 0) == -1) {
+ 	    text_color_set(DW_COLOR_ERROR);
+ 
+ 	    dw_printf ("------------------------------------------\n");
+@@ -407,7 +407,7 @@ int main (int argc, char *argv[])
+ 	while (1) {
+ 	  dwfix_t fix;
+ 
+-	  fix = dwgps_read (&info)
;
++	  fix = dwgps_read (&info, NULL, 0)
;
+ 	  text_color_set (DW_COLOR_INFO);
+ 	  switch (fix) {
+ 	    case DWFIX_2D:
+-- 
+2.19.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 61670e2bea28..d8882d6af0ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Alexander Fasching <fasching.a91@gmail.com>
 pkgname=direwolf-git
 _pkgname=direwolf
-pkgver=1.5.beta.r3.g2328ecd
+pkgver=1.5.beta4.r8.gda0a33e
 pkgrel=1
-pkgdesc="Dire Wolf is a software modem/TNC and APRS encoder/decoder"
+pkgdesc="Software modem/TNC and APRS encoder/decoder"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="https://github.com/wb2osz/direwolf"
 license=('GPL')
@@ -12,15 +12,18 @@ makedepends=('make' 'gcc' 'patch')
 provides=('direwolf')
 conflicts=('direwolf')
 source=('git+https://github.com/wb2osz/direwolf.git#branch=dev'
-        'Makefile.patch'
+        '0001-Makefile.patch'
+        '0002-Fix-build-error-with-latest-gpsd.patch'
         'direwolf.service'
         'direwolf-kiss.service')
 sha1sums=('SKIP'
           '8fd025e2df746a4c776c482f04ce93791aad01f6'
+          '7100a8a99a2e934e16372c70b18b86453a6266ad'
           '66366c7a4e8d3768013f9036f2681a86d4b8ad88'
           'eea3a3fb334645cd8a1e2604dc6c6b024148722a')
 sha256sums=('SKIP'
             'd3f93a6cabe348d410c630f612dd49373f9932f747588dfd915283f3167e2a48'
+            'eee5554700a2aaded8f4cc9bd0a635d7697280267db9b319ca727c32b07ce5a4'
             'a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a'
             '2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68')
 
@@ -32,7 +35,8 @@ pkgver() {
 
 prepare() {
     cd "$_pkgname"
-    git apply ../Makefile.patch
+    git apply ../0001-Makefile.patch
+    git apply ../0002-Fix-build-error-with-latest-gpsd.patch
 }
 
 build() {