gpsd: update to 3.20

Added patch that reverts patch from gpsd mainline,
because it messes with the buildflags.

BugzID: 60987

Signed-off-by: Lucien Mueller <lucien.mueller@netmodule.com>

recipes-connectivity/gpsd/files/0001-Revert-Fix-the-handling-of-defaults-from-the-environ.patch

@@ -0,0 +1,47 @@
+From 9b84789c22bec237835cbee24a26e028730c4c0e Mon Sep 17 00:00:00 2001
+From: Lucien Mueller <lucien.mueller@netmodule.com>
+Date: Fri, 21 Feb 2020 17:48:24 +0100
+Subject: [PATCH] Revert "Fix the handling of defaults from the environment."
+
+This reverts commit d0e0864c2802860ff561fe0b39939b63d38b8c70.
+---
+ SConstruct | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 5169d8f64..46c78a959 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -383,21 +383,21 @@ env['SC_PYTHON'] = sys.executable  # Path to SCons Python
+ # with multi-word CPPFLAGS/LDFLAGS/SHLINKFLAGS values; you'll have to
+ # explicitly quote them or (better yet) use the "=" form of GNU option
+ # settings.
+-# Scons also uses different internal names than most other build-systems.
+-# So we rely on MergeFlags/ParseFlags to do the right thing for us.
+ env['STRIP'] = "strip"
+ env['PKG_CONFIG'] = "pkg-config"
+-for i in ["AR", "CC", "CXX", "LD",
+-          "PKG_CONFIG", "STRIP", "TAR"]:
++for i in ["AR", "ARFLAGS", "CC", "CCFLAGS", "CFLAGS", "CXX", "CXXFLAGS", "LD",
++          "LINKFLAGS", "PKG_CONFIG", "STRIP", "TAR"]:
+     if i in os.environ:
+         j = i
+         if i == "LD":
+             i = "SHLINK"
+-        env[i] = os.getenv(j)
+-for i in ["ARFLAGS", "CFLAGS", "CXXFLAGS", "LDFLAGS", "SHLINKFLAGS",
+-          "CPPFLAGS", "CCFLAGS", "LINKFLAGS"]:
++        if i in ("CFLAGS", "CCFLAGS", "LINKFLAGS"):
++            env.Replace(**{j: Split(os.getenv(i))})
++        else:
++            env.Replace(**{j: os.getenv(i)})
++for flag in ["LDFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
+     if i in os.environ:
+-        env.MergeFlags(Split(os.getenv(i)))
++        env.MergeFlags({flag: Split(os.getenv(flag))})
+ 
+ 
+ # Keep scan-build options in the environment
+-- 
+2.24.0.rc1
+

recipes-connectivity/gpsd/gpsd/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch

@@ -1,8 +1,8 @@
-From 5464d9e1bfd1a1c54338ec7c4148cad1b222ef93 Mon Sep 17 00:00:00 2001
+From ff5af0adedb788f3a7be581e203516ae3f4a2ae9 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Tue, 24 Apr 2012 18:45:14 +0200
-Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot
+Subject: [PATCH 2/6] SConstruct: prefix includepy with sysroot and drop
- from python_lib_dir
+ sysroot from python_lib_dir
 
 * without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without sysroot prefix
   and with PYTHONPATH from OE it's pointing to native python dir
@@ -34,16 +34,15 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 Signed-off-by: Peter A. Bigot <pab@pabigot.com>
-
 ---
  SConstruct | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/SConstruct b/SConstruct
-index b8f3fb1..883e06d 100644
+index 6c0b9b998..cd2a10c86 100644
 --- a/SConstruct
 +++ b/SConstruct
-@@ -980,7 +980,7 @@ else:
+@@ -1127,7 +1127,7 @@ else:
  
  # Set up configuration for target Python
  
@@ -52,7 +51,7 @@ index b8f3fb1..883e06d 100644
  
  PYTHON_CONFIG_NAMES = ['CC', 'CXX', 'OPT', 'BASECFLAGS',
                         'CCSHARED', 'LDSHARED', 'SO', 'INCLUDEPY', 'LDFLAGS']
-@@ -1506,7 +1506,7 @@ else:
+@@ -1674,7 +1674,7 @@ else:
                         LINK=ldshared,
                         SHLIBPREFIX="",
                         SHLIBSUFFIX=python_config['SO'],
@@ -61,7 +60,7 @@ index b8f3fb1..883e06d 100644
                         CPPFLAGS=python_config['OPT'],
                         CFLAGS=python_config['BASECFLAGS'],
                         CXXFLAGS=python_config['BASECFLAGS'])
-@@ -1808,12 +1808,14 @@ if ((not env['debug'] and not env['profiling'] and not env['nostrip'] and
+@@ -1994,12 +1994,14 @@ if ((not env['debug'] and not env['profiling'] and not env['nostrip'] and
      env.AddPostAction(binaryinstall, '$STRIP $TARGET')
  
  if env['python']:
@@ -77,3 +76,6 @@ index b8f3fb1..883e06d 100644
  
      python_modules_install = python_env.Install(DESTDIR + python_module_dir,
                                                  python_modules)
+-- 
+2.24.0.rc1
+

recipes-connectivity/gpsd/gpsd_%.bbappend

@@ -1,8 +1,9 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 SRC_URI_prepend = " \
-            git://gitlab.com/netmodule/third-party/gpsd.git;protocol=ssh;user=git;branch=3.19/netmodule \
+            git://gitlab.com/netmodule/third-party/gpsd.git;protocol=ssh;user=git;branch=3.20/netmodule \
             file://60-ublox-neo.rules \ 
             file://0001-apply-python3-path-to-python2-env-to-use-pyserial-in.patch \
+            file://0001-Revert-Fix-the-handling-of-defaults-from-the-environ.patch \
             "
 SRC_URI_remove = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz"
 

recipes-connectivity/gpsd/gpsd_3.20.bb

@@ -7,7 +7,6 @@ PROVIDES = "virtual/gpsd"
 
 SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \
     file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
-    file://0001-gps_shm_close-Free-privdata.patch \
 "
 SRC_URI[md5sum] = "b3bf88706794eb8e5f2c2543bf7ba87b"
 SRC_URI[sha256sum] = "27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39"