Re: Prepare for gpsd-3.x

On Wed, July 31, 2019 14:52, Stuart Henderson wrote:
> On 2019/07/31 13:03, Kirill Bychkov wrote:
>> Ping
>>
>> On Wed, July 24, 2019 23:48, Kirill Bychkov wrote:
>> > On Thu, June 20, 2019 10:08, Kirill Bychkov wrote:
>> >> Hi!
>> >> Long time ago I've started update of gpsd from 2.x to 3.x.
>> >> Upstream moved from auto crap to scons so it gave me some
>> >> headache.
>> >> Before switching to new gpsd we need to prepare some ports
>> >> which are linking against libgps because API has changed.
>> >> Here are the diffs for foxtrotgps, geoclue and qlandkaretegt.
>> >
>> > Hi!
>> > foxtrotgps and viking are both updatetd to latest upstream releases
>> > which brings compatibility with gpsd-3.x.
>> > geoclue and qlandkartegt should be the last ports incompatible with
>> > new gpsd API.
>> > Pathces for fixing them are attached.
>> > OKs, objections?
>> >
>> > P.S. gpsd patch is also attached for review.
>> >
>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/geo/geoclue/Makefile,v
>> retrieving revision 1.29
>> diff -u -p -u -p -r1.29 Makefile
>> --- Makefile 6 Jul 2018 06:04:42 -0000 1.29
>> +++ Makefile 14 Jun 2019 07:11:23 -0000
>> @@ -3,7 +3,7 @@
>> COMMENT= modular geoinformation service on top of D-Bus
>>
>> DISTNAME= geoclue-0.12.99
>> -REVISION= 7
>> +REVISION= 8
>> SHARED_LIBS += geoclue 1.1 # .0.0
>> CATEGORIES= geo devel
>
> No objection to your diff, but TBH I would just use --disable-gpsd for
> this, this is the ancient version of geoclue that is only used by a few
> outdated Qt things and probably not anything that actually wants real
> location. The patch to the configure script can also be dropped then.

Makes sense to me.

Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/geoclue/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile 12 Jul 2019 20:46:28 -0000 1.32
+++ Makefile 31 Jul 2019 13:54:35 -0000
@@ -13,7 +13,7 @@ HOMEPAGE= http://geoclue.freedesktop.or
PERMIT_PACKAGE= Yes

WANTLIB = c dbus-1 dbus-glib-1 ffi gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gps iconv intl lzma m pcre pthread soup-2.4
+WANTLIB += gobject-2.0 iconv intl lzma m pcre pthread soup-2.4
WANTLIB += soup-gnome-2.4 sqlite3 xml2 z
WANTLIB += idn2 psl unistring

@@ -23,14 +23,14 @@ MODULES= devel/dconf

BUILD_DEPENDS = textproc/libxslt
LIB_DEPENDS = devel/libsoup \
- misc/gpsd \
x11/dbus-glib

USE_GMAKE= Yes

CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --disable-gtk \
- --disable-connman
+ --disable-connman \
+ --disable-gpsd
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 21 Sep 2012 13:19:01 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2012/09/21 13:19:01 jasper Exp $
-
-Link against -pthread
-
---- configure.orig Tue Jul 31 18:59:39 2012
-+++ configure Thu Sep 20 20:06:51 2012
-@@ -13144,7 +13144,7 @@ fi
-
- if test "x$have_skyhook" = "xyes"; then
- PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS skyhook"
-- GPSD_LIBS="-lgps"
-+ GPSD_LIBS="-lgps -pthread"
- else
- NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS skyhook"
- fi


>
> $ grep -w geo/geoclue INDEX | cut -d'|' -f1
> geoclue-0.12.99p8
> qtbase-5.9.7p6
> qtbase-examples-5.9.7
> qt5-global-5.9.7p0
> qt5-mysql-5.9.7p0
> qt5-postgresql-5.9.7p0
> qt5-sqlite2-5.9.7p0
> qt5-tds-5.9.7p0
> qtwebkit-5.9.0p8
>
> (And geoclue2 doesn't enable gpsd support).
>
>> +TEST_DEPENDS= misc/gpsd,-main \
>
> This would be better with a version spec e.g.
>
> TEST_DEPENDS= ${FULLPKGNAME-main}:${FULLPKGPATH-main}

Changed, thanks!

>
>> Index: pkg/PLIST-php
>> ===================================================================
>> RCS file: /cvs/ports/misc/gpsd/pkg/PLIST-php,v
>> retrieving revision 1.1
>> diff -u -p -u -p -r1.1 PLIST-php
>> --- pkg/PLIST-php 8 Feb 2007 23:03:38 -0000 1.1
>> +++ pkg/PLIST-php 25 Jul 2019 07:56:08 -0000
>> @@ -1,3 +1,4 @@
>> @comment $OpenBSD: PLIST-php,v 1.1 2007/02/08 23:03:38 ckuethe Exp $
>> +@cwd /var/www
>> gpsd/
>> gpsd/gpsd.php
>
> This shouldn't be needed with PREFIX-php?
>

It was added by update-plist. Should I remove in manually?