From 7ec1c2e0d120e1c232f98f4300a023f3f3e24ed8 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 25 Jan 2025 00:22:04 -0500 Subject: [PATCH] hamlib: update to 4.6.1. --- srcpkgs/hamlib/patches/fix-musl.patch | 12 ------------ srcpkgs/hamlib/patches/implicit-function-decl.patch | 10 ---------- srcpkgs/hamlib/patches/kenwood-mode.patch | 11 +++++++++++ srcpkgs/hamlib/template | 6 +++--- 4 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/hamlib/patches/fix-musl.patch delete mode 100644 srcpkgs/hamlib/patches/implicit-function-decl.patch create mode 100644 srcpkgs/hamlib/patches/kenwood-mode.patch diff --git a/srcpkgs/hamlib/patches/fix-musl.patch b/srcpkgs/hamlib/patches/fix-musl.patch deleted file mode 100644 index 4d057e5d039..00000000000 --- a/srcpkgs/hamlib/patches/fix-musl.patch +++ /dev/null @@ -1,12 +0,0 @@ -upstreamed in Hamlib/Hamlib#1024 - ---- a/rigs/prm80/prm80.h -+++ b/rigs/prm80/prm80.h -@@ -23,6 +23,7 @@ - #define _PRM80_H 1 - - #include -+#include - #include "misc.h" - - #define BACKEND_VER "20210416" diff --git a/srcpkgs/hamlib/patches/implicit-function-decl.patch b/srcpkgs/hamlib/patches/implicit-function-decl.patch deleted file mode 100644 index eb2928e61cb..00000000000 --- a/srcpkgs/hamlib/patches/implicit-function-decl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/tests/memload.c -+++ b/tests/memload.c -@@ -22,6 +22,7 @@ - #include - - #include -+#include - #include "misc.h" - - #ifdef HAVE_XML2 diff --git a/srcpkgs/hamlib/patches/kenwood-mode.patch b/srcpkgs/hamlib/patches/kenwood-mode.patch new file mode 100644 index 00000000000..0a6274e91ec --- /dev/null +++ b/srcpkgs/hamlib/patches/kenwood-mode.patch @@ -0,0 +1,11 @@ +--- hamlib-4.6.orig/rigs/kenwood/kenwood.h ++++ hamlib-4.6/rigs/kenwood/kenwood.h +@@ -183,7 +183,7 @@ + int save_k2_ext_lvl; // so we can restore to original + int save_k3_ext_lvl; // so we can restore to original -- for future use if needed + int voice_bank; /* last voice bank send for use by stop_voice_mem */ +- mode_t last_mode_pc; // last mode memory for PC command ++ rmode_t last_mode_pc; // last mode memory for PC command + int power_now,power_min,power_max; + }; + diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template index f70ea498af0..8dc198b8a14 100644 --- a/srcpkgs/hamlib/template +++ b/srcpkgs/hamlib/template @@ -1,7 +1,7 @@ # Template file for 'hamlib' pkgname=hamlib -version=4.5.5 -revision=3 +version=4.6.1 +revision=1 build_style=gnu-configure configure_args="--disable-static --with-perl-binding --with-python-binding --with-tcl-binding --with-xml-support" @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://hamlib.github.io" changelog="https://raw.githubusercontent.com/Hamlib/Hamlib/master/NEWS" distfiles="https://github.com/Hamlib/Hamlib/releases/download/${version}/hamlib-${version}.tar.gz" -checksum=601c89f32ed225e9527ade3d64d0d05d23202c05ae21ffa77e59d70ee4597fcd +checksum=0822f59fdda0e40283eb55d94c64fc92e608ec9985414acae93d122fa83dacd4 CFLAGS="-DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"