Re: [PR PATCH] [Updated] hamlib: update to 4.2.

[classabbyamp <classabbyamp@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1597 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages hamlib-4.2
https://github.com/void-linux/void-packages/pull/31351

hamlib: update to 4.2.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/31351.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hamlib-4.2-31351.patch --]
[-- Type: text/x-diff, Size: 9376 bytes --]

From 6b159ae4e701ef799dbddbd0dd9313b58063e699 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Mon, 7 Jun 2021 19:46:27 -0400
Subject: [PATCH 1/5] hamlib: update to 4.2.

Signed-off-by: Abigail G <dev@kb6.ee>
---
 common/shlibs                         |  4 ++--
 srcpkgs/hamlib/patches/fix-musl.patch | 11 +++++++++++
 srcpkgs/hamlib/template               |  7 +++----
 3 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/hamlib/patches/fix-musl.patch

diff --git a/common/shlibs b/common/shlibs
index 2485880dfe80..bad1b211e041 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3517,8 +3517,8 @@ libfstrcmp.so.0 libfstrcmp-0.7.D001_1
 libUMP.so.3 libump-git-20181122_2
 libdri2.so.1 libdri2-git-20140317_2
 libpst.so.4 libpst-0.6.72_1
-libhamlib.so.2 hamlib-3.3_1
-libhamlib++.so.2 hamlib-3.3_1
+libhamlib.so.4 hamlib-4.2_1
+libhamlib++.so.4 hamlib-4.2_1
 libnss_mdns_minimal.so.2 nss-mdns-0.14.1_1
 libnss_mdns4_minimal.so.2 nss-mdns-0.14.1_1
 libnss_mdns6_minimal.so.2 nss-mdns-0.14.1_1
diff --git a/srcpkgs/hamlib/patches/fix-musl.patch b/srcpkgs/hamlib/patches/fix-musl.patch
new file mode 100644
index 000000000000..a5aed42e0787
--- /dev/null
+++ b/srcpkgs/hamlib/patches/fix-musl.patch
@@ -0,0 +1,11 @@
+Index: rigs/prm80/prm80.h
+===================================================================
+--- rigs/prm80/prm80.h
++++ rigs/prm80/prm80.h
+@@ -23,6 +23,7 @@
+ #define _PRM80_H 1
+
+ #include <hamlib/rig.h>
++#include <sys/time.h> /* for timeval */
+
+ #define BACKEND_VER "20210416"
diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 63033abd8279..086b6c614c1f 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,11 +1,10 @@
 # Template file for 'hamlib'
 pkgname=hamlib
-version=3.3
-revision=5
+version=4.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-perl-binding --with-python-binding
  --with-tcl-binding --with-xml-support"
-pycompile_module="Hamlib.py"
 hostmakedepends="automake libtool pkg-config python3 swig"
 makedepends="gettext-devel libusb-devel libxml2-devel python3-devel readline-devel
  tcl-devel"
@@ -15,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/hamlib/"
 distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz"
-checksum=c90b53949c767f049733b442cd6e0a48648b55d99d4df5ef3f852d985f45e880
+checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5
 
 pre_configure() {
 	CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"

From 4a05f10439dd712551bd877fa686e88c38cd5927 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Mon, 7 Jun 2021 19:46:39 -0400
Subject: [PATCH 2/5] wsjtx: update to 2.4.0.

---
 srcpkgs/wsjtx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index 9b646cdd9ada..15b25e7a6f32 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,6 +1,6 @@
 # Template file for 'wsjtx'
 pkgname=wsjtx
-version=2.2.2
+version=2.4.0
 revision=1
 build_wrksrc="wsjtx"
 build_style=cmake
@@ -16,7 +16,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html"
 distfiles="${SOURCEFORGE_SITE}/wsjt/${pkgname}-${version}/${pkgname}-${version}.tgz"
-checksum=1cbc163f238a8cfd64cd9e4a00aa1e00ef43758a1ba9c5db83ca63ca60f64f9d
+checksum=2e97c6cc8fc7a6ca7bfcad1966ed8415596f59c374727010d51340c4232e81c8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From f169c0e618abe83a97bd806da2fe9574e88d6eb2 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Mon, 7 Jun 2021 19:46:45 -0400
Subject: [PATCH 3/5] qsstv: update to 9.5.3.

---
 srcpkgs/qsstv/patches/hamlib42.patch | 24 ++++++++++++++++++++++++
 srcpkgs/qsstv/template               |  6 +++---
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/qsstv/patches/hamlib42.patch

diff --git a/srcpkgs/qsstv/patches/hamlib42.patch b/srcpkgs/qsstv/patches/hamlib42.patch
new file mode 100644
index 000000000000..a46089695759
--- /dev/null
+++ b/srcpkgs/qsstv/patches/hamlib42.patch
@@ -0,0 +1,24 @@
+Index: rig/rigcontrol.cpp
+===================================================================
+--- rig/rigcontrol.cpp
++++ rig/rigcontrol.cpp
+@@ -34,6 +34,10 @@
+ 
+ #define MAXCONFLEN 128
+ 
++#ifndef HAMLIB_FILPATHLEN
++#define HAMLIB_FILPATHLEN FILEPATHLEN
++#endif
++
+ 
+ QList<const rig_caps *> capsList;
+ bool radiolistLoaded=false;
+@@ -87,7 +91,7 @@ bool rigControl::init()
+     }
+   if(!catParams.serialPort.isEmpty())
+      {
+-      strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN-1);
++      strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),HAMLIB_FILPATHLEN-1);
+     }
+ //  strncpy(my_rig->state.pttport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN);
+   my_rig->state.rigport.parm.serial.rate = catParams.baudrate;
diff --git a/srcpkgs/qsstv/template b/srcpkgs/qsstv/template
index 0431df489345..73c1080fcadc 100644
--- a/srcpkgs/qsstv/template
+++ b/srcpkgs/qsstv/template
@@ -1,6 +1,6 @@
 # Template file for 'qsstv'
 pkgname=qsstv
-version=9.4.4
+version=9.5.3
 revision=1
 wrksrc="${pkgname}_${version}"
 build_style=qmake
@@ -13,8 +13,8 @@ license="GPL-3.0-or-later"
 homepage="http://users.telenet.be/on4qz/qsstv/"
 changelog="http://users.telenet.be/on4qz/qsstv/manual/changelog.html"
 distfiles="http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"
-checksum=f1a3c2f5e97b2efc36893b36dda9a0852d7c51129436e586580c05e2b5e93039
+checksum=177e286090c71f8a033646b39c3b6abe212cc06718c1ecc9ddc7024198cb7e40
 
 post_install() {
-	vinstall qsstv/icons/qsstv.png 644 usr/share/pixmaps
+	vinstall icons/qsstv.png 644 usr/share/pixmaps
 }

From 014eabeb20bd73d2d037f33b0a268495cae6376d Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Mon, 7 Jun 2021 19:46:51 -0400
Subject: [PATCH 4/5] fldigi: update to 4.1.18.

---
 srcpkgs/fldigi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fldigi/template b/srcpkgs/fldigi/template
index 098d0431c497..7a46fdec280c 100644
--- a/srcpkgs/fldigi/template
+++ b/srcpkgs/fldigi/template
@@ -1,6 +1,6 @@
 # Template file for 'fldigi'
 pkgname=fldigi
-version=4.1.13
+version=4.1.18
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.w1hkj.com"
 distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
-checksum=448867a113c35d7ad908fc92774a995dae5e6c4f0f2219e93586c031cb279856
+checksum=3c7fd84ab3a84ba4525b251e9d56120daee626a3831684a974fdad476f90270d

From 493daa2a2475e31cb5ce5455c0e510d00bd5204b Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Mon, 7 Jun 2021 19:46:59 -0400
Subject: [PATCH 5/5] CubicSDR: update to 0.2.5.

---
 srcpkgs/CubicSDR/patches/hamlib42.patch | 36 +++++++++++++++++++++++++
 srcpkgs/CubicSDR/template               |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/CubicSDR/patches/hamlib42.patch

diff --git a/srcpkgs/CubicSDR/patches/hamlib42.patch b/srcpkgs/CubicSDR/patches/hamlib42.patch
new file mode 100644
index 000000000000..e6d0da47b76f
--- /dev/null
+++ b/srcpkgs/CubicSDR/patches/hamlib42.patch
@@ -0,0 +1,36 @@
+Index: external/hamlib/hamlib/rig.h
+===================================================================
+--- external/hamlib/hamlib/rig.h
++++ external/hamlib/hamlib/rig.h
+@@ -147,7 +147,7 @@ typedef struct rig RIG;
+ 
+ #define RIGNAMSIZ 30
+ #define RIGVERSIZ 8
+-#define FILPATHLEN 100
++#define HAMLIB_FILPATHLEN 100
+ #define FRQRANGESIZ 30
+ #define MAXCHANDESC 30      /* describe channel eg: "WWV 5Mhz" */
+ #define TSLSTSIZ 20         /* max tuning step list size, zero ended */
+@@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
+     int timeout;            /*!< Timeout, in mS */
+     int retry;              /*!< Maximum number of retries, 0 to disable */
+ 
+-    char pathname[FILPATHLEN];      /*!< Port pathname */
++    char pathname[HAMLIB_FILPATHLEN];      /*!< Port pathname */
+ 
+     union {
+         struct {
+
+Index: src/rig/RigThread.cpp
+===================================================================
+--- src/rig/RigThread.cpp
++++ src/rig/RigThread.cpp
+@@ -114,7 +114,7 @@ void RigThread::run() {
+     std::cout << "Rig thread starting." << std::endl;
+ 
+     rig = rig_init(rigModel);
+-	strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
++	strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
+ 	rig->state.rigport.parm.serial.rate = serialRate;
+ 	retcode = rig_open(rig);
+     
diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index 4b6b1aafc922..f2eb67e7f9b5 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -1,7 +1,7 @@
 # Template file for 'CubicSDR'
 pkgname=CubicSDR
 version=0.2.5
-revision=2
+revision=3
 build_style=cmake
 build_helper="cmake-wxWidgets-gtk3"
 configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)