CVS commit: pkgsrc/audio/audacity

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Mon Sep 29 20:52:04 UTC 2025

Modified Files:
        pkgsrc/audio/audacity: distinfo
Added Files:
        pkgsrc/audio/audacity/patches:
            patch-lib-src_libnyquist_nyquist_cmt_cmdline.c
            patch-lib-src_libnyquist_nyquist_cmt_midifile.c
            patch-lib-src_libnyquist_nyquist_nyqsrc_handlers.c
            patch-lib-src_libnyquist_nyquist_xlisp_security.c

Log Message:
Fix build with GCC 14.

Fix some ctype abuse (not strictly a breakage with GCC 14, but noticed and
fixed anyway.)
Add missing default "int" types in a few places.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/audio/audacity/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_cmt_cmdline.c \
    pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_cmt_midifile.c \
    pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_nyqsrc_handlers.c \
    pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_security.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/audacity/distinfo
diff -u pkgsrc/audio/audacity/distinfo:1.49 pkgsrc/audio/audacity/distinfo:1.50
--- pkgsrc/audio/audacity/distinfo:1.49 Mon Sep  1 15:12:19 2025
+++ pkgsrc/audio/audacity/distinfo      Mon Sep 29 20:52:03 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2025/09/01 15:12:19 kikadf Exp $
+$NetBSD: distinfo,v 1.50 2025/09/29 20:52:03 mrg Exp $
 
 BLAKE2s (audacity-2.4.1.tar.gz) = 53a42d20bfea5dfecfe0f40f7c668036c1057a4dddaea5541802ccd76aa75e99
 SHA512 (audacity-2.4.1.tar.gz) = 2f0a3f7e24dce91ae520e285dbb05778b68e0fe37b8ded55ac568b5f8135069951b3986764adc5d0791c165b283a3c19596f1d6f51ba17028e0eb04558c63f25
@@ -11,9 +11,13 @@ SHA1 (patch-include_audacity_Types.h) = 
 SHA1 (patch-lib-src_FileDialog_Makefile.am) = cc78f4d26210b536b4e1d88ab668295625aac73b
 SHA1 (patch-lib-src_FileDialog_Makefile.in) = 44ca2539d68ab3951ae44377ed56f574785c1b08
 SHA1 (patch-lib-src_lib-widget-extra_Makefile.am) = 03d080c141259fbf02a9c5a70ce06625fcebf75e
+SHA1 (patch-lib-src_libnyquist_nyquist_cmt_cmdline.c) = a82d9f7234656067e6eb73bbab187db54bd403e7
+SHA1 (patch-lib-src_libnyquist_nyquist_cmt_midifile.c) = 2e26f99c72b617b4bacf64779d61215e4bbd14be
 SHA1 (patch-lib-src_libnyquist_nyquist_cmupv_src_cmupv.c) = 3d6cb845d82b1bcbe31dabd4bad30cb1f7ea27d5
+SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_handlers.c) = 9eed5375b2490c0a15bd230534314a73b1aa11d6
 SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = dbc0b5b88043c7b2895742e78e6a5990f65012ef
 SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = 9401ac521d5a2aa8600a465b9133dff7e7b2ea35
+SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_security.c) = 5d881632884312ec65a270ed5d7696da3852021b
 SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = a79f2f58f32f96fc67bc2420bef6c812d37c96f0
 SHA1 (patch-lib-src_portmixer_src_Makefile.am) = 9a0d5be37753683a2cade42673edb3d08e01ab4d
 SHA1 (patch-lib-src_sbsms_src_Makefile.am) = 2beca18a286de1b26f4f96976fb58e1665d0531c

Added files:

Index: pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_cmt_cmdline.c
diff -u /dev/null pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_cmt_cmdline.c:1.1
--- /dev/null   Mon Sep 29 20:52:04 2025
+++ pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_cmt_cmdline.c        Mon Sep 29 20:52:03 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-lib-src_libnyquist_nyquist_cmt_cmdline.c,v 1.1 2025/09/29 20:52:03 mrg Exp $
+
+Fix ctype-abuse.
+
+--- lib-src/libnyquist/nyquist/cmt/cmdline.c.orig      2020-05-19 02:43:53.000000000 -0700
++++ lib-src/libnyquist/nyquist/cmt/cmdline.c   2025-09-25 13:16:00.064742864 -0700
+@@ -377,10 +377,10 @@
+         while (*syntax_ptr != EOS) {
+             register char *s_ptr = s;
+             while (*syntax_ptr != EOS &&
+-                   !(isalnum(*syntax_ptr))) syntax_ptr++;
++                   !(isalnum((unsigned char)*syntax_ptr))) syntax_ptr++;
+             while (*s_ptr != EOS && (*s_ptr++ == *syntax_ptr))
+                 syntax_ptr++; /* only increment if there's a match */
+-            if (!(isalnum(*s_ptr)) && *syntax_ptr == '<') {
++            if (!(isalnum((unsigned char)*s_ptr)) && *syntax_ptr == '<') {
+                 syntax_ptr++; /* advance to the type field */
+                 if (*syntax_ptr == 's') return cl_SW;
+                 if (*syntax_ptr != 'o') 
+@@ -402,7 +402,7 @@
+         char *syntax_ptr = syntax[i];
+         while (*syntax_ptr != EOS) {
+             while (*syntax_ptr != EOS &&
+-                   !(isalnum(*syntax_ptr))) syntax_ptr++;
++                   !(isalnum((unsigned char)*syntax_ptr))) syntax_ptr++;
+             if (s[0] == *syntax_ptr) {
+                 if (found_it) return FALSE;     /* ambiguous */
+                 /* else, find the type */
Index: pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_cmt_midifile.c
diff -u /dev/null pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_cmt_midifile.c:1.1
--- /dev/null   Mon Sep 29 20:52:04 2025
+++ pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_cmt_midifile.c       Mon Sep 29 20:52:03 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib-src_libnyquist_nyquist_cmt_midifile.c,v 1.1 2025/09/29 20:52:03 mrg Exp $
+
+Add missing types for functions.
+
+--- lib-src/libnyquist/nyquist/cmt/midifile.c.orig     2020-05-19 02:43:53.000000000 -0700
++++ lib-src/libnyquist/nyquist/cmt/midifile.c  2025-09-25 13:30:45.282507999 -0700
+@@ -379,7 +379,7 @@
+ }
+ 
+ static void
+-metaevent(type)
++metaevent(int type)
+ {
+         int leng = msgleng();
+         char *m = msg();
+@@ -509,7 +509,7 @@
+ }
+ 
+ static long
+-to32bit(c1,c2,c3,c4)
++to32bit(int c1,int c2,int c3,int c4)
+ {
+         long value = 0L;
+ 
Index: pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_nyqsrc_handlers.c
diff -u /dev/null pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_nyqsrc_handlers.c:1.1
--- /dev/null   Mon Sep 29 20:52:04 2025
+++ pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_nyqsrc_handlers.c    Mon Sep 29 20:52:04 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib-src_libnyquist_nyquist_nyqsrc_handlers.c,v 1.1 2025/09/29 20:52:04 mrg Exp $
+
+Add missing types for functions.
+
+--- lib-src/libnyquist/nyquist/nyqsrc/handlers.c.orig  2020-05-19 02:43:53.000000000 -0700
++++ lib-src/libnyquist/nyquist/nyqsrc/handlers.c       2025-09-25 13:32:12.586486909 -0700
+@@ -6,7 +6,7 @@
+ 
+ /* note -- a simple way to make a midi note on channel 1 */
+ /**/
+-void note(pitch, dur)
++void note(int pitch, int dur)
+ {
+ }
+ 
Index: pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_security.c
diff -u /dev/null pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_security.c:1.1
--- /dev/null   Mon Sep 29 20:52:04 2025
+++ pkgsrc/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_security.c     Mon Sep 29 20:52:04 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-lib-src_libnyquist_nyquist_xlisp_security.c,v 1.1 2025/09/29 20:52:04 mrg Exp $
+
+Ensure unistd.h is included on NetBSD.
+Fix ctype-abuse.
+
+--- lib-src/libnyquist/nyquist/xlisp/security.c.orig   2020-05-19 02:43:53.000000000 -0700
++++ lib-src/libnyquist/nyquist/xlisp/security.c        2025-09-25 13:14:10.427474354 -0700
+@@ -4,7 +4,7 @@
+  */
+ 
+ #include <stdlib.h>
+-#if defined(UNIX) || defined(__APPLE__)
++#if defined(UNIX) || defined(__APPLE__) || defined(__NetBSD__)
+ #include <unistd.h>
+ #endif
+ #ifdef WIN32
+@@ -142,7 +142,7 @@
+     /* windows allows '/' instead of '\' */
+     if (filename[0] == '/') return TRUE;
+     if (strlen(filename) > 2 &&
+-      isalpha(filename[0]) &&
++      isalpha((unsigned char)filename[0]) &&
+       filename[1] == ':') return TRUE;
+     return FALSE;
+ }