[packages/hamlib] Up to 4.6.5

[arekm]

commit 3404cd08fded1b017e82a4329a530f31993acc48
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Sep 6 12:18:12 2025 +0200

    Up to 4.6.5

 hamlib-usrp.patch | 102 ------------------------------------------------------
 hamlib.spec       |   9 ++---
 2 files changed, 3 insertions(+), 108 deletions(-)
---
diff --git a/hamlib.spec b/hamlib.spec
index d1d884e..01ed5c9 100644
--- a/hamlib.spec
+++ b/hamlib.spec
@@ -12,15 +12,14 @@
 Summary:	Library to control radio transceivers and receivers
 Summary(pl.UTF-8):	Biblioteka do sterowania nadajnikami i odbiornikami radiowymi
 Name:		hamlib
-Version:	4.6.2
-Release:	2
+Version:	4.6.5
+Release:	1
 License:	LGPL v2.1+ (library), GPL v2+ (programs)
 Group:		Libraries
 #Source0Download: https://github.com/Hamlib/Hamlib/releases
 Source0:	https://github.com/Hamlib/Hamlib/releases/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	5cf7fa5fdc692050c7df8ea709f63f25
+# Source0-md5:	f09da0a80c604de24c87bdb1b6d34c2d
 Patch0:		%{name}-perl_install.patch
-Patch1:		%{name}-usrp.patch
 URL:		http://hamlib.org/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
@@ -229,7 +228,6 @@ radiem z poziomu skryptów Tcl-a.
 %prep
 %setup -q
 %patch -P 0 -p1
-%patch -P 1 -p1
 
 %build
 %{__libtoolize}
@@ -440,7 +438,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -n python-%{name}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/_Hamlib.so
-%{py_sitedir}/Hamlib.py[co]
 %endif
 
 %if %{with python3}
diff --git a/hamlib-usrp.patch b/hamlib-usrp.patch
deleted file mode 100644
index f7badab..0000000
--- a/hamlib-usrp.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- hamlib-4.6.2/rigs/kit/usrp_impl.cc.orig	2025-03-29 19:21:53.168641530 +0100
-+++ hamlib-4.6.2/rigs/kit/usrp_impl.cc	2025-03-29 19:28:39.819771845 +0100
-@@ -32,7 +32,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <errno.h>
--#include <usrp_standard.h>
-+#include <usrp/usrp_standard.h>
- 
- #include "usrp_impl.h"
- #include "token.h"
-@@ -46,7 +46,7 @@ struct usrp_priv_data {
- int usrp_init(RIG *rig)
- {
-     // cppcheck-suppress leakReturnValNotUsed
--	STATE(rig)->priv = static_cast<struct usrp_priv_data*>malloc(sizeof(struct usrp_priv_data));
-+	STATE(rig)->priv = static_cast<struct usrp_priv_data*>(malloc(sizeof(struct usrp_priv_data)));
- 	if (!STATE(rig)->priv) {
- 		/* whoops! memory shortage! */
- 		return -RIG_ENOMEM;
-@@ -69,7 +69,7 @@ int usrp_cleanup(RIG *rig)
- 
- int usrp_open(RIG *rig)
- {
--	struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>STATE(rig)->priv;
-+	struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>(STATE(rig)->priv);
- 
- 	int which_board = 0;
- 	int decim = 125;
-@@ -83,7 +83,7 @@ int usrp_open(RIG *rig)
- 
- int usrp_close(RIG *rig)
- {
--	struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>STATE(rig)->priv;
-+	struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>(STATE(rig)->priv);
- 
-     if (!priv)
-     {
-@@ -101,7 +101,7 @@ int usrp_close(RIG *rig)
-  */
- int usrp_set_conf(RIG *rig, hamlib_token_t token, const char *val)
- {
--	struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>STATE(rig)->priv;
-+	struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>(STATE(rig)->priv);
- 
-     if (!priv)
-     {
-@@ -111,7 +111,7 @@ int usrp_set_conf(RIG *rig, hamlib_token
- 
- 	switch(token) {
- 		case TOK_IFMIXFREQ:
--			sscanf(val, "%"SCNfreq, &priv->if_mix_freq);
-+			sscanf(val, "%" SCNfreq, &priv->if_mix_freq);
- 			break;
- 		default:
- 			return -RIG_EINVAL;
-@@ -126,7 +126,7 @@ int usrp_set_conf(RIG *rig, hamlib_token
-  */
- int usrp_get_conf(RIG *rig, hamlib_token_t token, char *val)
- {
--	const struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>STATE(rig)->priv;
-+	const struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>(STATE(rig)->priv);
- 
-     if (!priv)
-     {
-@@ -136,7 +136,7 @@ int usrp_get_conf(RIG *rig, hamlib_token
- 
- 	switch(token) {
- 		case TOK_IFMIXFREQ:
--			sprintf(val, "%"PRIfreq, priv->if_mix_freq);
-+			sprintf(val, "%" PRIfreq, priv->if_mix_freq);
- 			break;
- 		default:
- 			return -RIG_EINVAL;
-@@ -148,7 +148,7 @@ int usrp_get_conf(RIG *rig, hamlib_token
- 
- int usrp_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
- {
--	const struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>STATE(rig)->priv;
-+	const struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>(STATE(rig)->priv);
- 	int chan = 0;
- 
-     if (!priv)
-@@ -166,7 +166,7 @@ int usrp_set_freq(RIG *rig, vfo_t vfo, f
- 
- int usrp_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
- {
--	const struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>STATE(rig)->priv;
-+	const struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>(STATE(rig)->priv);
- 	int chan = 0;
- 
-     if (!priv)
---- hamlib-4.6.2/rigs/kit/usrp.c.orig	2025-02-09 22:22:13.000000000 +0100
-+++ hamlib-4.6.2/rigs/kit/usrp.c	2025-03-29 21:09:18.280392029 +0100
-@@ -22,6 +22,7 @@
- /*
-  * Compile only this model if usrp is available
-  */
-+#include "hamlib/config.h"
- #if defined(HAVE_USRP)
- 
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hamlib.git/commitdiff/3404cd08fded1b017e82a4329a530f31993acc48