From a313d33b47b1e4feb9031acbbf919ad8bcefc9cd Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 31 May 2021 11:58:37 -0500 Subject: [PATCH 1/3] Rebuild for hamlib 4.2. --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 050a608..79e9641 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -63,6 +63,9 @@ desktop-file-install \ %changelog +* Mon May 31 2021 Richard Shaw - 2.0.22-2 +- Rebuild for hamlib 4.2. + * Mon May 10 2021 Richard Shaw - 2.0.22-1 - Update to 2.0.22. From 1ba1cb460951522fdedce998bfeef0c43c335951 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Thu, 23 Dec 2021 13:45:19 -0600 Subject: [PATCH 2/3] Rebuild for hamlib 4.4. --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 79e9641..019534a 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.22 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -63,6 +63,9 @@ desktop-file-install \ %changelog +* Thu Dec 23 2021 Richard Shaw - 2.0.22-3 +- Rebuild for hamlib 4.4. + * Mon May 31 2021 Richard Shaw - 2.0.22-2 - Rebuild for hamlib 4.2. From dfa382fde82968cdebca05af334a6233b783b58f Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Thu, 23 Dec 2021 16:12:54 -0600 Subject: [PATCH 3/3] Add patch from rawhide for hamlib 4.4. --- xlog-hamlib42.patch | 24 ++++++++++++++++++++++++ xlog.spec | 1 + 2 files changed, 25 insertions(+) create mode 100644 xlog-hamlib42.patch diff --git a/xlog-hamlib42.patch b/xlog-hamlib42.patch new file mode 100644 index 0000000..774b96c --- /dev/null +++ b/xlog-hamlib42.patch @@ -0,0 +1,24 @@ +Index: xlog-2.0.22/src/hamlib-utils.c +=================================================================== +--- xlog-2.0.22.orig/src/hamlib-utils.c ++++ xlog-2.0.22/src/hamlib-utils.c +@@ -45,6 +45,10 @@ + #include "../data/pixmaps/s8.xpm" + #include "../data/pixmaps/s9.xpm" + ++#ifndef HAMLIB_FILPATHLEN ++#define HAMLIB_FILPATHLEN FILEPATHLEN ++#endif ++ + struct rig_id { + const gint modelnr; + const gchar *modelname; +@@ -168,7 +172,7 @@ start_hamlib (gint rigid, gchar *device, + update_statusbar (temp); + } + } +- strncpy (myrig->state.rigport.pathname, device, FILPATHLEN); ++ strncpy (myrig->state.rigport.pathname, device, HAMLIB_FILPATHLEN); + retcode = rig_open (myrig); + if (retcode != RIG_OK) + { diff --git a/xlog.spec b/xlog.spec index 019534a..42ea31d 100644 --- a/xlog.spec +++ b/xlog.spec @@ -8,6 +8,7 @@ URL: http://www.nongnu.org/xlog/ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-2.0.19-no-error.patch +Patch1: xlog-hamlib42.patch BuildRequires: make BuildRequires: gcc