Re: [PR PATCH] [Updated] New package: direwolf-1.6

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

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

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

https://github.com/classabbyamp/void-packages new/direwolf
https://github.com/void-linux/void-packages/pull/37147

New package: direwolf-1.6
<!-- Uncomment relevant sections and delete options which are not applicable -->
saw the recently-closed #27510, was interested in it, brought it back to life and cleaned it up a bit more.

closes #33142

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- 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/37147.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/direwolf-37147.patch --]
[-- Type: text/x-diff, Size: 7122 bytes --]

From a27e4326baa1da2a7e2ed442db359b68b5d11116 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 16 May 2022 02:28:19 -0400
Subject: [PATCH] New package: direwolf-1.6

---
 srcpkgs/direwolf/patches/fix_desktop.patch    | 20 +++++++++++
 srcpkgs/direwolf/patches/fix_musl.patch       | 26 ++++++++++++++
 .../patches/fix_scripts_install.patch         | 36 +++++++++++++++++++
 .../direwolf/patches/fix_udev_install.patch   | 13 +++++++
 srcpkgs/direwolf/template                     | 15 ++++++++
 5 files changed, 110 insertions(+)
 create mode 100644 srcpkgs/direwolf/patches/fix_desktop.patch
 create mode 100644 srcpkgs/direwolf/patches/fix_musl.patch
 create mode 100644 srcpkgs/direwolf/patches/fix_scripts_install.patch
 create mode 100644 srcpkgs/direwolf/patches/fix_udev_install.patch
 create mode 100644 srcpkgs/direwolf/template

diff --git a/srcpkgs/direwolf/patches/fix_desktop.patch b/srcpkgs/direwolf/patches/fix_desktop.patch
new file mode 100644
index 000000000000..3f851c4c44f1
--- /dev/null
+++ b/srcpkgs/direwolf/patches/fix_desktop.patch
@@ -0,0 +1,20 @@
+fix issues in the desktop file (no icon, hardcodes xterm)
+
+upstreamed in wb2osz/direwolf#393
+
+--- a/cmake/cpack/direwolf.desktop.in
++++ b/cmake/cpack/direwolf.desktop.in
+@@ -2,9 +2,9 @@
+ Name=@APPLICATION_NAME@
+ Comment=APRS Soundcard TNC
+-Exec=@APPLICATION_DESKTOP_EXEC@
++Exec=@CMAKE_PROJECT_NAME@
+-Icon=@CMAKE_PROJECT_NAME@_icon.png
++Icon=@CMAKE_PROJECT_NAME@_icon
+ StartupNotify=true
+-Terminal=false
++Terminal=true
+ Type=Application
+ Categories=HamRadio
+ Keywords=Ham Radio;APRS;Soundcard TNC;KISS;AGWPE;AX.25
+ 
diff --git a/srcpkgs/direwolf/patches/fix_musl.patch b/srcpkgs/direwolf/patches/fix_musl.patch
new file mode 100644
index 000000000000..29d91d7f569c
--- /dev/null
+++ b/srcpkgs/direwolf/patches/fix_musl.patch
@@ -0,0 +1,26 @@
+fixes compilation on musl
+
+upstreamed in wb2osz/direwolf#394
+
+--- a/src/direwolf.h
++++ b/src/direwolf.h
+@@ -282,7 +282,7 @@
+ char *strcasestr(const char *S, const char *FIND);
+ 
+ 
+-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
++#if ! defined(__GLIBC__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
+ 
+ // strlcpy and strlcat should be in string.h and the C library.
+ 
+--- a/src/decode_aprs.c
++++ b/src/decode_aprs.c
+@@ -3930,7 +3930,7 @@
+  * models before getting to the more generic APY.
+  */
+ 
+-#if defined(__WIN32__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
++#if ! defined(__GLIBC__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
+ 	    qsort (tocalls, num_tocalls, sizeof(struct tocalls_s), tocall_cmp);
+ #else
+ 	    qsort (tocalls, num_tocalls, sizeof(struct tocalls_s), (__compar_fn_t)tocall_cmp);
diff --git a/srcpkgs/direwolf/patches/fix_scripts_install.patch b/srcpkgs/direwolf/patches/fix_scripts_install.patch
new file mode 100644
index 000000000000..21bd7d699064
--- /dev/null
+++ b/srcpkgs/direwolf/patches/fix_scripts_install.patch
@@ -0,0 +1,36 @@
+these scripts should probably not be put in /usr/bin, but instead with the rest of the scripts
+
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ 
+ if(NOT (WIN32 OR CYGWIN))
+-  install(PROGRAMS "${CUSTOM_SCRIPTS_DIR}/dwespeak.sh" DESTINATION ${INSTALL_BIN_DIR})
++  install(PROGRAMS "${CUSTOM_SCRIPTS_DIR}/dwespeak.sh" DESTINATION ${INSTALL_SCRIPTS_DIR})
+   install(PROGRAMS "${CUSTOM_SCRIPTS_DIR}/dw-start.sh" DESTINATION ${INSTALL_SCRIPTS_DIR})
+   add_subdirectory(telemetry-toolkit)
+ endif()
+--- a/scripts/telemetry-toolkit/CMakeLists.txt
++++ b/scripts/telemetry-toolkit/CMakeLists.txt
+@@ -1,12 +1,12 @@
+-install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-balloon.pl" DESTINATION ${INSTALL_BIN_DIR})
+-install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-bits.pl" DESTINATION ${INSTALL_BIN_DIR})
+-install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-data.pl" DESTINATION ${INSTALL_BIN_DIR})
+-install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-data91.pl" DESTINATION ${INSTALL_BIN_DIR})
+-install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-eqns.pl" DESTINATION ${INSTALL_BIN_DIR})
+-install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-parm.pl" DESTINATION ${INSTALL_BIN_DIR})
+-install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-seq.sh" DESTINATION ${INSTALL_BIN_DIR})
+-install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-unit.pl" DESTINATION ${INSTALL_BIN_DIR})
+-install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-volts.py" DESTINATION ${INSTALL_BIN_DIR})
++install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-balloon.pl" DESTINATION ${INSTALL_SCRIPTS_DIR})
++install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-bits.pl" DESTINATION ${INSTALL_SCRIPTS_DIR})
++install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-data.pl" DESTINATION ${INSTALL_SCRIPTS_DIR})
++install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-data91.pl" DESTINATION ${INSTALL_SCRIPTS_DIR})
++install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-eqns.pl" DESTINATION ${INSTALL_SCRIPTS_DIR})
++install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-parm.pl" DESTINATION ${INSTALL_SCRIPTS_DIR})
++install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-seq.sh" DESTINATION ${INSTALL_SCRIPTS_DIR})
++install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-unit.pl" DESTINATION ${INSTALL_SCRIPTS_DIR})
++install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-volts.py" DESTINATION ${INSTALL_SCRIPTS_DIR})
+ 
+ install(FILES "${CUSTOM_TELEMETRY_DIR}/telem-m0xer-3.txt" DESTINATION ${INSTALL_CONF_DIR})
+ install(FILES "${CUSTOM_TELEMETRY_DIR}/telem-balloon.conf" DESTINATION ${INSTALL_CONF_DIR})
diff --git a/srcpkgs/direwolf/patches/fix_udev_install.patch b/srcpkgs/direwolf/patches/fix_udev_install.patch
new file mode 100644
index 000000000000..e4285a414b20
--- /dev/null
+++ b/srcpkgs/direwolf/patches/fix_udev_install.patch
@@ -0,0 +1,13 @@
+install udev rules in the proper place
+
+--- a/conf/CMakeLists.txt
++++ b/conf/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ 
+ # install udev rules for CM108
+ if(LINUX)
+-  install(FILES "${CUSTOM_CONF_DIR}/99-direwolf-cmedia.rules" DESTINATION /etc/udev/rules.d/)
++  install(FILES "${CUSTOM_CONF_DIR}/99-direwolf-cmedia.rules" DESTINATION /usr/lib/udev/rules.d/)
+ endif()
+ 
+ install(FILES "${CMAKE_BINARY_DIR}/direwolf.conf" DESTINATION ${INSTALL_CONF_DIR})
diff --git a/srcpkgs/direwolf/template b/srcpkgs/direwolf/template
new file mode 100644
index 000000000000..c3e8b206b7b7
--- /dev/null
+++ b/srcpkgs/direwolf/template
@@ -0,0 +1,15 @@
+# Template file for 'direwolf'
+pkgname=direwolf
+version=1.6
+revision=1
+build_style=cmake
+configure_args="-DFORCE_SSE=1 -DRUN_NEON=advanced"
+makedepends="alsa-lib-devel hamlib-devel eudev-libudev-devel"
+short_desc="AX.25 packet modem/TNC and APRS encoder/decoder"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/wb2osz/direwolf"
+changelog="https://raw.githubusercontent.com/wb2osz/direwolf/master/CHANGES.md"
+distfiles="https://github.com/wb2osz/direwolf/archive/refs/tags/${version}.tar.gz"
+checksum=208b0563c9b339cbeb0e1feb52dc18ae38295c40c0009d6381fc4acb68fdf660
+python_version=3