kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

comms/wsjtx: Same bug as hamlib treating a function like a variable

Browse source 
wsjtx insist on packaging their own version of hamlib which means
the fix to hamlib meant the bug was still in wsjtx
This commit is contained in:
Diane Bruce 2023-02-17 18:47:32 -05:00
parent 4662347330
commit adf4a62979
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
comms/wsjtx/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= wsjtx
DISTVERSION= 2.5.4
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= comms hamradio
MASTER_SITES= SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
@ -41,7 +41,7 @@ _PATCHES= wsjtx.patch hamlib.patch
FFLAGS+= -fallow-argument-mismatch
.endif
_HAMLIB_PATCHES= configure hamlib.pc.in tests/rigtestlibusb.c
_HAMLIB_PATCHES= configure hamlib.pc.in tests/rigtestlibusb.c src/misc.c
make-hamlib-patch:
${MV} ${FILESDIR}/hamlib.patch ${FILESDIR}/hamlib.patch.old
. for f in ${_HAMLIB_PATCHES}

24
comms/wsjtx/files/hamlib.patch
View file

@ -1,5 +1,5 @@
--- hamlib/configure.orig 2022-01-02 11:10:19.000000000 +0100
+++ hamlib/configure 2022-04-13 12:51:01.174492000 +0200
--- hamlib/configure.orig 2022-01-02 05:10:19.000000000 -0500
+++ hamlib/configure 2023-02-17 16:55:21.413328000 -0500
@@ -19135,7 +19135,7 @@
case "$host_os" in #(
freebsd*) :
@ -17,8 +17,8 @@
LIBUSB=""
--- hamlib/hamlib.pc.in.orig 2022-01-02 11:10:11.000000000 +0100
+++ hamlib/hamlib.pc.in 2022-04-13 12:34:36.119285000 +0200
--- hamlib/hamlib.pc.in.orig 2022-01-02 05:10:11.000000000 -0500
+++ hamlib/hamlib.pc.in 2023-02-17 16:55:21.413939000 -0500
@@ -7,7 +7,6 @@
Description: Library to control radio and rotator equipment.
URL: @PACKAGE_URL@
@ -29,8 +29,8 @@
-Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@
+Libs: -L${libdir} ${libdir}/libhamlib.a
+Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ -lusb
--- hamlib/tests/rigtestlibusb.c.orig 2022-01-02 11:10:11.000000000 +0100
+++ hamlib/tests/rigtestlibusb.c 2022-04-13 12:34:36.119728000 +0200
--- hamlib/tests/rigtestlibusb.c.orig 2022-01-02 05:10:11.000000000 -0500
+++ hamlib/tests/rigtestlibusb.c 2023-02-17 16:55:21.414509000 -0500
@@ -115,7 +115,10 @@
printf(" wSpeedSupported: %u\n", ss_usb_cap->wSpeedSupported);
printf(" bFunctionalitySupport: %u\n", ss_usb_cap->bFunctionalitySupport);
@ -60,3 +60,15 @@
libusb_free_bos_descriptor(bos);
}
--- hamlib/src/misc.c.orig 2023-02-17 18:06:57.171679000 -0500
+++ hamlib/src/misc.c 2023-02-17 18:13:49.377881000 -0500
@@ -2550,7 +2550,8 @@
if (localtime)
{
mytm = localtime_r(&t, &result);
- mytimezone = timezone;
+ /* For FreeBSD */
+ mytimezone = mytm->tm_gmtoff;
}
else
{