gpsd: updated to 3.16

This commit is contained in:
uriahheep 2016-01-12 02:41:29 -05:00
parent fe11f4b542
commit 310305ffd1
3 changed files with 6 additions and 44 deletions

View File

@ -1,38 +0,0 @@
From 95c99f69e026e8c57aecba545e51c97f3b284e75 Mon Sep 17 00:00:00 2001
From: Gary E. Miller <gem@rellim.com>
Date: Tue, 23 Jun 2015 21:36:26 +0000
Subject: Remove a BSD-ism.
CTRL('L') is a BSD-ism. CTRL() is defined in sys/ttydefaults.h
which does not always exist. Instead of adding scons tests for
needing CTRL() and its include files just replace with a simple
constant.
Needed for musl and found by Baruch Siach <baruch@tkos.co.il>
---
diff --git a/gpsmon.c b/gpsmon.c
index c3001c8..58c8300 100644
--- a/gpsmon.c
+++ b/gpsmon.c
@@ -583,6 +583,9 @@ static void select_packet_monitor(struct gps_device_t *device)
(void)wnoutrefresh(devicewin);
}
+/* Control-L character */
+#define CTRL_L 0x0C
+
static char *curses_get_command(void)
/* char-by-char nonblocking input, return accumulated command line on \n */
{
@@ -591,7 +594,8 @@ static char *curses_get_command(void)
int c;
c = wgetch(cmdwin);
- if (c == CTRL('L')) {
+ if (CTRL_L == c) {
+ /* ^L is to repaint the screen */
(void)clearok(stdscr, true);
if (active != NULL && (*active)->initialize != NULL)
(void)(*active)->initialize();
--
cgit v0.9.0.2

View File

@ -9,6 +9,6 @@ diff -urN gpsd-3.15-old/SConstruct gpsd-3.15-new/SConstruct
- ncurseslibs = pkg_config('ncurses')
+ if config.CheckPKG('ncursesw'):
+ ncurseslibs = pkg_config('ncursesw')
if config.CheckPKG('tinfo'):
ncurseslibs += pkg_config('tinfo')
elif WhereIs('ncurses5-config'):
ncurseslibs = ['!ncurses5-config --libs --cflags']
elif WhereIs('ncursesw5-config'):

View File

@ -1,7 +1,7 @@
# Template file for 'gpsd'
pkgname=gpsd
version=3.15
revision=2
version=3.16
revision=1
build_style=scons
patch_args=-p1
make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin udevdir=/usr/lib/udev CC=${CC}"
@ -12,10 +12,10 @@ maintainer="uriahheep <uriahheep@gmail.com>"
license="BSD"
homepage="http://www.catb.org/gpsd/"
distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.gz"
checksum="81c89e271ae112313e68655ab30d227bc38fe7841ffbff0f1860b12a9d7696ea"
checksum="03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029"
system_accounts="gpsd"
hostmakedepends="scons pkg-config bc python libxslt xmlto asciidoc"
hostmakedepends="scons pkg-config bc python libxslt xmlto asciidoc ncurses"
makedepends="libudev-devel ntp libusb-devel ncurses-devel pps-tools-devel libcap-devel libbluetooth-devel"
subpackages="gpsd-devel"