Accepting request 1240502 from hardware:sdr
OBS-URL: https://build.opensuse.org/request/show/1240502 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hamlib?expand=0&rev=22
This commit is contained in:
Git OBS Bridge
@@ -1,55 +0,0 @@
|
||||
From f2a9f091d08667db9d3fc2e842a427af7cfb990e Mon Sep 17 00:00:00 2001
|
||||
From: Michael Black W9MDB <mdblack98@yahoo.com>
|
||||
Date: Sun, 29 Dec 2024 08:42:24 -0600
|
||||
Subject: [PATCH 1/6] Change rig_list_foreach back to using const argument --
|
||||
was breaking many C++ application builds
|
||||
https://github.com/Hamlib/Hamlib/issues/1647
|
||||
|
||||
---
|
||||
include/hamlib/rig.h | 2 +-
|
||||
src/register.c | 2 +-
|
||||
tests/rigctl_parse.c | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
|
||||
index c15c706c9..bba2f8133 100644
|
||||
--- a/include/hamlib/rig.h
|
||||
+++ b/include/hamlib/rig.h
|
||||
@@ -3791,7 +3791,7 @@ extern HAMLIB_EXPORT(int)
|
||||
rig_unregister HAMLIB_PARAMS((rig_model_t rig_model));
|
||||
|
||||
extern HAMLIB_EXPORT(int)
|
||||
-rig_list_foreach HAMLIB_PARAMS((int (*cfunc)(struct rig_caps *, rig_ptr_t),
|
||||
+rig_list_foreach HAMLIB_PARAMS((int (*cfunc)(const struct rig_caps *, rig_ptr_t),
|
||||
rig_ptr_t data));
|
||||
|
||||
extern HAMLIB_EXPORT(int)
|
||||
diff --git a/src/register.c b/src/register.c
|
||||
index fcf62b03e..ef0c1f9fd 100644
|
||||
--- a/src/register.c
|
||||
+++ b/src/register.c
|
||||
@@ -393,7 +393,7 @@ int HAMLIB_API rig_unregister(rig_model_t rig_model)
|
||||
* executes cfunc on all the elements stored in the rig hash list
|
||||
*/
|
||||
//! @cond Doxygen_Suppress
|
||||
-int HAMLIB_API rig_list_foreach(int (*cfunc)(struct rig_caps *,
|
||||
+int HAMLIB_API rig_list_foreach(int (*cfunc)(const struct rig_caps *,
|
||||
rig_ptr_t),
|
||||
rig_ptr_t data)
|
||||
{
|
||||
diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
|
||||
index 263a7bad8..bcb10af96 100644
|
||||
--- a/tests/rigctl_parse.c
|
||||
+++ b/tests/rigctl_parse.c
|
||||
@@ -2088,7 +2088,7 @@ int print_conf_list2(const struct confparams *cfp, rig_ptr_t data)
|
||||
return 1; /* !=0, we want them all ! */
|
||||
}
|
||||
|
||||
-static int hash_model_list(struct rig_caps *caps, void *data)
|
||||
+static int hash_model_list(const struct rig_caps *caps, void *data)
|
||||
{
|
||||
hash_add_model(caps->rig_model,
|
||||
caps->mfg_name,
|
||||
--
|
||||
2.47.1
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From 601dd1361cbc897b41c989a10dca2e2bb191a112 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Black W9MDB <mdblack98@yahoo.com>
|
||||
Date: Sun, 29 Dec 2024 08:51:47 -0600
|
||||
Subject: [PATCH 2/6] Fix testrigopen.c rig_list_foreach
|
||||
https://github.com/Hamlib/Hamlib/issues/1647
|
||||
|
||||
---
|
||||
tests/testrigopen.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/testrigopen.c b/tests/testrigopen.c
|
||||
index b98064a1e..74886e8d7 100644
|
||||
--- a/tests/testrigopen.c
|
||||
+++ b/tests/testrigopen.c
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
#define SERIAL_PORT "/dev/ttyUSB0"
|
||||
|
||||
-int callback(struct rig_caps *caps, rig_ptr_t rigp)
|
||||
+int callback(const struct rig_caps *caps, rig_ptr_t rigp)
|
||||
{
|
||||
RIG *rig = (RIG *) rigp;
|
||||
|
||||
--
|
||||
2.47.1
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From 728d0a543290d23c4f19023f15845e1ca0e7fc3f Mon Sep 17 00:00:00 2001
|
||||
From: Michael Black W9MDB <mdblack98@yahoo.com>
|
||||
Date: Sun, 29 Dec 2024 08:56:53 -0600
|
||||
Subject: [PATCH 3/6] Fix listrigs.s rig_list_foreach
|
||||
https://github.com/Hamlib/Hamlib/issues/1647
|
||||
|
||||
---
|
||||
tests/listrigs.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/listrigs.c b/tests/listrigs.c
|
||||
index 65300d25f..230b1c413 100644
|
||||
--- a/tests/listrigs.c
|
||||
+++ b/tests/listrigs.c
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <hamlib/rig.h>
|
||||
|
||||
|
||||
-int print_caps_sum(struct rig_caps *caps, void *data)
|
||||
+int print_caps_sum(const struct rig_caps *caps, void *data)
|
||||
{
|
||||
const char *fmt1 = "%-13s";
|
||||
printf("%6u \t%-22s \t%-23s\t%-8s \t",
|
||||
--
|
||||
2.47.1
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From ac8a8b2027983f6710f29abc170555607b4796c9 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Black W9MDB <mdblack98@yahoo.com>
|
||||
Date: Sun, 29 Dec 2024 10:33:33 -0600
|
||||
Subject: [PATCH 4/6] Fix rig_list_foreach in hamlibmodels.c
|
||||
https://github.com/Hamlib/Hamlib/issues/1647
|
||||
|
||||
---
|
||||
tests/hamlibmodels.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/hamlibmodels.c b/tests/hamlibmodels.c
|
||||
index 0a5e21596..a7cfac7f0 100644
|
||||
--- a/tests/hamlibmodels.c
|
||||
+++ b/tests/hamlibmodels.c
|
||||
@@ -7,7 +7,7 @@ char *list[1000]; // as of 2023-01-17 we have 275 rigs so this should cover us f
|
||||
|
||||
int nmodels = 0;
|
||||
|
||||
-static int hash_model_list(struct rig_caps *caps, void *data)
|
||||
+static int hash_model_list(const struct rig_caps *caps, void *data)
|
||||
{
|
||||
char s[256];
|
||||
sprintf(s, "%s %s", caps->mfg_name, caps->model_name);
|
||||
--
|
||||
2.47.1
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 028d750249ab00c8c362598c838b15e8aa6a2951 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Black W9MDB <mdblack98@yahoo.com>
|
||||
Date: Sun, 29 Dec 2024 10:43:39 -0600
|
||||
Subject: [PATCH 5/6] Fix rig_list_foreach in testmW2power.c
|
||||
|
||||
---
|
||||
tests/testmW2power.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/testmW2power.c b/tests/testmW2power.c
|
||||
index 88c38b6ed..9e910e95c 100644
|
||||
--- a/tests/testmW2power.c
|
||||
+++ b/tests/testmW2power.c
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
int nrigs = 0;
|
||||
|
||||
-int callback(struct rig_caps *caps, rig_ptr_t rigp)
|
||||
+int callback(const struct rig_caps *caps, rig_ptr_t rigp)
|
||||
{
|
||||
RIG *rig = (RIG *) rigp;
|
||||
|
||||
--
|
||||
2.47.1
|
||||
|
||||
3
hamlib-4.6.1.tar.gz
Normal file
3
hamlib-4.6.1.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0822f59fdda0e40283eb55d94c64fc92e608ec9985414acae93d122fa83dacd4
|
||||
size 2909273
|
||||
6
hamlib-4.6.1.tar.gz.asc
Normal file
6
hamlib-4.6.1.tar.gz.asc
Normal file
@@ -0,0 +1,6 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABECAB0WIQSC1k9rDmfNQfaJu6b7LFEw1VqIGQUCZ5BUAwAKCRD7LFEw1VqI
|
||||
GaXpAJ407PoNByaar/35Q67Fvy7x67wnMwCgmuXamiHMntpEPpDFnpo13M7G8jI=
|
||||
=XTzo
|
||||
-----END PGP SIGNATURE-----
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6f873579bc4e0ef4e540313ec2acd4f198b5510d7dd9397a4ae68fe8ff20d167
|
||||
size 2905124
|
||||
@@ -1,6 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABECAB0WIQSC1k9rDmfNQfaJu6b7LFEw1VqIGQUCZ2q+GgAKCRD7LFEw1VqI
|
||||
GdcHAJ94GjtX7o5rpLl2dwn3TrltzQ7NKACeOEaNoJmfTFNgUmGJb6JuVfHm89Q=
|
||||
=nODu
|
||||
-----END PGP SIGNATURE-----
|
||||
@@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 22 16:28:43 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
- update to 4.6.1:
|
||||
* Fix C++ builds failing on rig_list_foreach function
|
||||
* Fix IC9100 rigctld startup to end up on VFOA
|
||||
* Fix grig build by removing sys/socket.h -- apparently not needed
|
||||
* Add new QMX entry to fix incompability with QDX
|
||||
* Fix IC746/PROT to not use data byte
|
||||
* FLRig to add DATA-U DATA-L modes
|
||||
* Fix TS570 RIG_LEVEL_STRENGTH with cal table
|
||||
* Remove get_powerstat from IC785X -- not supported
|
||||
* Fix SDRConsole by removing lots of things it does not have
|
||||
- drop patches:
|
||||
* 0001-Change-rig_list_foreach-back-to-using-const-argument.patch
|
||||
* 0002-Fix-testrigopen.c-rig_list_foreach.patch
|
||||
* 0003-Fix-listrigs.s-rig_list_foreach.patch
|
||||
* 0004-Fix-rig_list_foreach-in-hamlibmodels.c.patch
|
||||
* 0005-Fix-rig_list_foreach-in-testmW2power.c.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 11 17:26:08 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
%define sover 4
|
||||
Name: hamlib
|
||||
Version: 4.6
|
||||
Version: 4.6.1
|
||||
Release: 0
|
||||
Summary: Run-time library to control radio transcievers and receivers
|
||||
License: LGPL-2.1-only
|
||||
@@ -30,11 +30,6 @@ Source2: https://github.com/Hamlib/Hamlib/releases/download/%{version}/%{
|
||||
# taken from debian
|
||||
Source3: %{name}.keyring
|
||||
Patch0: hamlib-3.0-perl_install.patch
|
||||
Patch1: 0001-Change-rig_list_foreach-back-to-using-const-argument.patch
|
||||
Patch2: 0002-Fix-testrigopen.c-rig_list_foreach.patch
|
||||
Patch3: 0003-Fix-listrigs.s-rig_list_foreach.patch
|
||||
Patch4: 0004-Fix-rig_list_foreach-in-hamlibmodels.c.patch
|
||||
Patch5: 0005-Fix-rig_list_foreach-in-testmW2power.c.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libtool
|
||||
|
||||
Reference in New Issue
Block a user