From 682a710db3cf3559b8d0d62bb9d0d35f519bcb97 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 26 Feb 2022 22:36:08 -0500 Subject: [PATCH] gpsd: fix ncurses detection, build clients --- srcpkgs/gpsd/patches/fix-ncurses.patch | 20 ++++++++++++++++++++ srcpkgs/gpsd/template | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gpsd/patches/fix-ncurses.patch diff --git a/srcpkgs/gpsd/patches/fix-ncurses.patch b/srcpkgs/gpsd/patches/fix-ncurses.patch new file mode 100644 index 0000000000..5ebeb00ff8 --- /dev/null +++ b/srcpkgs/gpsd/patches/fix-ncurses.patch @@ -0,0 +1,20 @@ +Upstream supports ncursesw but doesn't properly detect it. Let's do things the +right way and allow optional clients to be built. + +https://gitlab.com/gpsd/gpsd/-/merge_requests/295 + +diff --git a/SConscript b/SConscript +index 345ead71550069f8fe976fab3f529f56b9e59e2b..e9c22358e0834404b1f1cfbbb1a0fca3ff58b658 100644 +--- a/SConscript ++++ b/SConscript +@@ -1023,6 +1023,10 @@ if not cleaning and not helping: + ncurseslibs = pkg_config('ncurses', rpath_hack=True) + if config.CheckPKG('tinfo'): + ncurseslibs += pkg_config('tinfo', rpath_hack=True) ++ elif config.CheckPKG('ncursesw'): ++ ncurseslibs = pkg_config('ncursesw', rpath_hack=True) ++ if config.CheckPKG('tinfo'): ++ ncurseslibs += pkg_config('tinfo', rpath_hack=True) + # It's not yet known whether rpath_hack is appropriate for + # ncurses5-config. + elif WhereIs('ncurses5-config'): diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index 668e388548..c60f03ae5b 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -1,7 +1,7 @@ # Template file for 'gpsd' pkgname=gpsd version=3.23.1 -revision=3 +revision=4 build_style=scons make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin udevdir=/usr/lib/udev CC=${CC} qt_versioned=5"