On Thu, Mar 04, 2021 at 12:00:49PM +0100, Landry Breuil wrote:
> On Thu, Mar 04, 2021 at 11:20:01AM +0100, Landry Breuil wrote:
> > On Thu, Mar 04, 2021 at 11:16:37AM +0100, Landry Breuil wrote:
> > > On Wed, Mar 03, 2021 at 10:48:40PM +0100, Michael wrote:
> > > > On Tue, Mar 02, 2021 at 05:06:45PM +0100, Landry Breuil wrote:
> > > > > On Tue, Mar 02, 2021 at 04:07:52PM +0100, Michael wrote:
> > > > > > On Tue, Mar 02, 2021 at 03:48:00PM +0100, Landry Breuil wrote:
> > > > > > > [...]
> > > > > > > can you check that it builds without the
> > > > > > > -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 in CFLAGS ? according to
> > > > > > > https://github.com/Xastir/Xastir/issues/47 that shouldnt be needed
> > > > > > > anymore, and a devel/proj update will remove proj_api.h.
> > > > > > >
> > > > > > > Landry
> > > > > > >
> > > > > >
> > > > > > Hello Landry,
> > > > > >
> > > > > > you are right, this is no longer needed.
> > > > > > Builds and runs fine without it, updated diff below.
> > > > >
> > > > > Thanks, that's great news ! I have zero knowledge about amateur radio,
> > > > > nor if this software works or not, but i'll definitely like the update
> > > > > so that i have one less hurdle to update proj !
> > > > >
> > > > > Landry
> > > > >
> > > >
> > > > The most basic things should work. Internet connectivity with common
> > > > servers such as aprs2.net also works well. It would be interesting to
> > > > get a report of somone using a serial connected GPS device since there
> > > > are OpenBSD specific patches for this in the port. But I don't think
> > > > this is critical. Also one could interface with gpsd too. Apart from
> > > > that I did not encounter any problems yet so I consider this program
> > > > well-functioning.
> > > >
> > > > If someone tries this port I recommend getting better map files as
> > > > discussed here: https://github.com/Xastir/Xastir/issues/152
> > >
> > > trying to build your diff with proj 8.0 installed, i get this configure output:
> > > ...
> > > checking for pj_init in -lproj... no
> > > ...
> > > *** Warning: geotiff requires libproj.
> > > ...
> > > configure: WARNING: unrecognized options: --with-pcre, --with-dbfawk,
> > > --with-rtree, --disable-gtk-doc
> > >
> > > MINIMUM OPTIONS:
> > > ShapeLib (Vector maps) .................... : yes
> > >
> > > RECOMMENDED OPTIONS:
> > > Xpm / Snapshots ........................... : yes
> > > GraphicsMagick/ImageMagick (Raster maps) .. : yes (GraphicsMagick)
> > > pcre (Shapefile customization) ............ : yes
> > > Berkeley DB map caching-Raster map speedups : yes
> > > internet map retrieval .................... : yes (libcurl)
> > >
> > > FOR THE ADVENTUROUS:
> > > AX25 (Linux Kernel I/O Drivers) ........... : no
> > > libproj (USGS Topos & Aerial Photos) ...... : no
> > > GeoTiff (USGS Topos & Aerial Photos) ...... : no
> > > Festival (Text-to-speech) ................. : no
> > > GPSMan/gpsmanshp (GPS downloads) .......... : no
> > >
> > > and port-lib-depends-check says that it didnt link against those libs:
> > > xastir-2.1.6(comms/xastir):
> > > Extra: gdal.40 geotiff.3 iconv.7 proj.16 tiff.40
> > >
> > > Can you recheck this on your install, so that i know if its local due to
> > > my testing of proj 8.0 ?
> >
> > Ah, i looked a bit more, and its been reported/fixed upstream with
> > https://github.com/Xastir/Xastir/commit/6ee6348ca9ad8556e48d26d976f5d6709e8e31cb
> > cf https://github.com/Xastir/Xastir/issues/173
> >
> > so i know where to look when i update proj, your diff should be totally
> > fine with proj 7.0.
>
> and looking again a bit closer, gdal support was removed in
> https://github.com/Xastir/Xastir/pull/48 so gdal can go away from the
> depends.
>
> xastir-2.1.6(comms/xastir):
> Extra: gdal.40 iconv.7
>
> the fact that it thinks iconv is extra is probably due to you removal of
> configure.ac patch, which was here since the import and adding
> AC_CHECK_LIB(iconv, libiconv_open, LIBS="-liconv ${LIBS}")
>
> can you also recheck if intl/iconv support works fine without this
> dependency ?
>
> Landry
I hope I was able to follow you. Xastir still builds and runs fine with
iconv and gdal removed from the port. Not sure if that is relevant or
not but switching to different languages also still works and Umlauts
etc. work too. For the record: with proj-7.2.1.
Diff below.
Michael
Index: Makefile
===================================================================
RCS file: /cvs/ports/comms/xastir/Makefile,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 Makefile
--- Makefile 18 Feb 2021 22:08:25 -0000 1.42
+++ Makefile 2 Mar 2021 15:01:15 -0000
@@ -2,21 +2,25 @@
COMMENT= X amateur station tracking and info reporting
-DISTNAME= xastir-2.0.6
-REVISION= 6
+VERSION= 2.1.6
+GH_ACCOUNT= Xastir
+GH_PROJECT= Xastir
+GH_TAGNAME= Release-${VERSION}
+DISTNAME= ${GH_PROJECT}-${VERSION}
+PKGNAME= xastir-${VERSION}
-CATEGORIES= comms hamradio geo
+CATEGORIES= comms hamradio geo
HOMEPAGE= https://xastir.org/
+MAINTAINER= Michael <michi+openbsd@dataswamp.org>
+
PERMIT_PACKAGE= Yes
WANTLIB = GraphicsMagick ICE SM X11 Xext Xm Xpm Xt bz2 c curl db
-WANTLIB += freetype gdal geotiff iconv intl lcms2 ltdl lzma m pcre proj
+WANTLIB += freetype gdal geotiff iconv lcms2 ltdl lzma m pcre proj
WANTLIB += pthread shp tiff z
-MASTER_SITES= $(MASTER_SITE_SOURCEFORGE:=xastir/)
-
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.11
@@ -24,8 +28,6 @@ MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -
.if ${MACHINE} == "sparc64"
CFLAGS += -fno-tree-ter
.endif
-# https://github.com/Xastir/Xastir/issues/47 proj 6
-CFLAGS += -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
CONFIGURE_ARGS= --with-shapelib \
--with-pcre \
Index: distinfo
===================================================================
RCS file: /cvs/ports/comms/xastir/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 7 Nov 2014 14:20:11 -0000 1.4
+++ distinfo 2 Mar 2021 15:01:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (xastir-2.0.6.tar.gz) = 5G3r0/Z+pcCOL4XwPiZlOHGpzdbWksju7kNsO8io3UM=
-SIZE (xastir-2.0.6.tar.gz) = 2662042
+SHA256 (Xastir-2.1.6.tar.gz) = WnGvKTbU0jfHebHDpRkhH4480DuYc6JgyEndyJUOGj4=
+SIZE (Xastir-2.1.6.tar.gz) = 2687180
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/comms/xastir/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 16 Jun 2019 13:41:30 -0000 1.2
+++ patches/patch-Makefile_in 2 Mar 2021 15:01:15 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2019/0
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -284,7 +284,7 @@ libexecdir = @libexecdir@
+@@ -352,7 +352,7 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lpr = @lpr@
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 16 Jun 2019 13:41:30 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.3 2019/06/16 13:41:30 ajacoutot Exp $
-
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -355,6 +355,7 @@ AC_CHECK_FUNCS([roundf])
-
- # Check for intl library (Needed for Cygwin)
- #
-+AC_CHECK_LIB(iconv, libiconv_open, LIBS="-liconv ${LIBS}")
- AC_CHECK_LIB(intl, gettext, LIBS="-lintl ${LIBS}")
-
- # Check for libproj (need to do this before test for shapelib, because
Index: patches/patch-src_gps_c
===================================================================
RCS file: /cvs/ports/comms/xastir/patches/patch-src_gps_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_gps_c
--- patches/patch-src_gps_c 10 Sep 2019 11:21:24 -0000 1.1
+++ patches/patch-src_gps_c 2 Mar 2021 15:01:15 -0000
@@ -1,33 +1,31 @@
-$OpenBSD: patch-src_gps_c,v 1.1 2019/09/10 11:21:24 jca Exp $
-
-
+$OpenBSD$
Index: src/gps.c
--- src/gps.c.orig
+++ src/gps.c
-@@ -559,7 +559,6 @@ int gps_data_find(char *gps_line_data, int port) {
- int have_valid_string = 0;
+@@ -644,7 +644,6 @@ int gps_data_find(char *gps_line_data, int port)
+ int have_valid_string = 0;
#ifndef __CYGWIN__
- struct timeval tv;
-- struct timezone tz;
+ struct timeval tv;
+- struct timezone tz;
No comments:
Post a Comment