From ad96acd158c73713a29daf5a81549924a548feac Mon Sep 17 00:00:00 2001
From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Sun, 22 Aug 2021 16:21:58 +0200
Subject: [PATCH] gpsd: bump to 3.23

Contains fix for time jumping back 1024 weeks after 23-October-2021.

Changes:

- Between current version and 3.23 the ABI version changed from 27 to
  29. Add ABI_VERSION variable to package as the jumps occur often.
- 0001-no-distutils-import.patch: removed because current patch doesn't
  work with new release and host python3-distutils is a build
  requirement anyway.
- 0002-ncurses6_detection.patch: fixed the patch. Currently the first
  "elif" checks for "ncurses6-config". But this is only provided by
  ncurses/host package, so the CFLAGS then contain includes that point
  into $(STAGING_DIR_HOSTPKG). The ncurses target package only installs
  "ncursesw6-config" into the staging area. So this is the only tool of
  interest. Also, the hunk moved from SConstruct to SConscript.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---
 utils/gpsd/Makefile                           |  7 ++++---
 .../patches/0001-no-distutils-import.patch    | 19 -------------------
 .../patches/0002-ncurses6_detection.patch     |  8 +++-----
 3 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 utils/gpsd/patches/0001-no-distutils-import.patch

diff --git a/utils/gpsd/Makefile b/utils/gpsd/Makefile
index e1b18685e..60e40f058 100644
--- a/utils/gpsd/Makefile
+++ b/utils/gpsd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gpsd
-PKG_VERSION:=3.21
+PKG_VERSION:=3.23
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME)
-PKG_HASH:=5512a7d3c2e86be83c5555652e5b4cc9049e8878a4320be7f039eb1a7203e5f0
+PKG_HASH:=e36429b9f6fc42004894dff3dc4453f5b43f95af8533b96d3d135987418da9df
 
 PKG_MAINTAINER:=Pushpal Sidhu <psidhu.devel@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
@@ -87,6 +87,7 @@ define Package/libgps
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=C service library for communicating with the GPS daemon
+  ABI_VERSION:=29
 endef
 
 define Package/libgps/description
@@ -157,7 +158,7 @@ endef
 
 define Package/libgps/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.so.$(ABI_VERSION)* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,gpsd))
diff --git a/utils/gpsd/patches/0001-no-distutils-import.patch b/utils/gpsd/patches/0001-no-distutils-import.patch
deleted file mode 100644
index 61b3d6ea3..000000000
--- a/utils/gpsd/patches/0001-no-distutils-import.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -42,7 +42,6 @@ import re
- import subprocess
- import sys
- import time
--from distutils import sysconfig
- import SCons
- 
- 
-@@ -303,7 +302,7 @@ EnsureSConsVersion(2, 3, 0)
- EnsurePythonVersion(2, 6)
- 
- 
--PYTHON_SYSCONFIG_IMPORT = 'from distutils import sysconfig'
-+PYTHON_SYSCONFIG_IMPORT = ''
- 
- # Utility productions
- 
diff --git a/utils/gpsd/patches/0002-ncurses6_detection.patch b/utils/gpsd/patches/0002-ncurses6_detection.patch
index da8c81776..13ad85c9d 100644
--- a/utils/gpsd/patches/0002-ncurses6_detection.patch
+++ b/utils/gpsd/patches/0002-ncurses6_detection.patch
@@ -1,11 +1,9 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -1068,6 +1068,10 @@ else:
+--- a/SConscript
++++ b/SConscript
+@@ -1027,6 +1027,8 @@ if not cleaning and not helping:
                  ncurseslibs += pkg_config('tinfo', rpath_hack=True)
          # It's not yet known whether rpath_hack is appropriate for
          # ncurses5-config.
-+        elif WhereIs('ncurses6-config'):
-+            ncurseslibs = ['!ncurses6-config --libs --cflags']
 +        elif WhereIs('ncursesw6-config'):
 +            ncurseslibs = ['!ncursesw6-config --libs --cflags']
          elif WhereIs('ncurses5-config'):