CVS commit: pkgsrc/wm/afterstep

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Sep 12 02:18:42 UTC 2025

Modified Files:
        pkgsrc/wm/afterstep: Makefile distinfo
Added Files:
        pkgsrc/wm/afterstep/patches: patch-libAfterBase_mystring.c
            patch-src_afterstep_events.c patch-src_afterstep_menuitem.c

Log Message:
afterstep: more build and runtime fixes

Fixes a crash on startup with NetBSD >= 10.99.14, and address further
missing function prototypes. (More crashes with seemingly different
causes can still occur on recent NetBSD, needs more investigation.)


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/wm/afterstep/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/wm/afterstep/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/wm/afterstep/patches/patch-libAfterBase_mystring.c \
    pkgsrc/wm/afterstep/patches/patch-src_afterstep_events.c \
    pkgsrc/wm/afterstep/patches/patch-src_afterstep_menuitem.c

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

Modified files:

Index: pkgsrc/wm/afterstep/Makefile
diff -u pkgsrc/wm/afterstep/Makefile:1.114 pkgsrc/wm/afterstep/Makefile:1.115
--- pkgsrc/wm/afterstep/Makefile:1.114  Thu Sep 11 21:35:01 2025
+++ pkgsrc/wm/afterstep/Makefile        Fri Sep 12 02:18:42 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.114 2025/09/11 21:35:01 gutteridge Exp $
+# $NetBSD: Makefile,v 1.115 2025/09/12 02:18:42 gutteridge Exp $
 
 DISTNAME=      AfterStep-2.2.12
 PKGNAME=       ${DISTNAME:S/AfterStep/afterstep/}
-PKGREVISION=   15
+PKGREVISION=   16
 CATEGORIES=    wm
 MASTER_SITES=  ftp://ftp.afterstep.org/stable/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/wm/afterstep/distinfo
diff -u pkgsrc/wm/afterstep/distinfo:1.32 pkgsrc/wm/afterstep/distinfo:1.33
--- pkgsrc/wm/afterstep/distinfo:1.32   Thu Sep 11 21:35:01 2025
+++ pkgsrc/wm/afterstep/distinfo        Fri Sep 12 02:18:42 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2025/09/11 21:35:01 gutteridge Exp $
+$NetBSD: distinfo,v 1.33 2025/09/12 02:18:42 gutteridge Exp $
 
 BLAKE2s (AfterStep-2.2.12.tar.bz2) = 7805d82301489abce1fb81b73beeff5c2efee85592281578a06c3bcbe1056ac8
 SHA512 (AfterStep-2.2.12.tar.bz2) = 5cac6ce74b24cbcc5b8e8a6f7cc9308e110f0d09597af1fa0a8730d5f5111932a23332629bc4d372fc8d9583a514d97e35f747b17decf8d4ebfe5e3f20cdbbee
@@ -14,6 +14,7 @@ SHA1 (patch-libAfterBase_Makefile.in) = 
 SHA1 (patch-libAfterBase_ashash.c) = d893caaf3db1523e7e6a11f5677def3078a2c8e5
 SHA1 (patch-libAfterBase_asvector.c) = b4feb2a0f10110464d798f1ea405fd4a40490e52
 SHA1 (patch-libAfterBase_asvector.h) = f1c775e576dcdbbd8fa73a4fd362dc6e17d84b58
+SHA1 (patch-libAfterBase_mystring.c) = 25c2b226c6770c0352baddfa75b5ebe3b7023f06
 SHA1 (patch-libAfterBase_output.c) = fe0d9b4cbe3c2d1eac50e4c4c0d6fbd3b8b7487f
 SHA1 (patch-libAfterBase_parse.c) = aba8ed0b11821ed09ded8833140c250abf6ea6da
 SHA1 (patch-libAfterBase_parse.h) = 5e2e0a1b3351f7d3b7d84076879e3827d47e3f24
@@ -45,4 +46,6 @@ SHA1 (patch-src_ASDocGen_Makefile.in) = 
 SHA1 (patch-src_ASDocGen_xmlproc.c) = fc8f974b8b53e0285a5323a76737dcc067a4ee03
 SHA1 (patch-src_Animate_Makefile.in) = fd5c50d91233e062c05c3bd4abe85741f345dff4
 SHA1 (patch-src_afterstep_asinternals.h) = 92264d8a7397001a6b5934397670d85b94c5e10a
+SHA1 (patch-src_afterstep_events.c) = f6636a0741ca3912189d390b6fb47d0a4fb2fc37
+SHA1 (patch-src_afterstep_menuitem.c) = c2d141a39069301b02cb51d7a478d7ce26082b86
 SHA1 (patch-src_afterstep_misc.c) = 5025169242453fb35b96adbb5e0aec1173db8447

Added files:

Index: pkgsrc/wm/afterstep/patches/patch-libAfterBase_mystring.c
diff -u /dev/null pkgsrc/wm/afterstep/patches/patch-libAfterBase_mystring.c:1.1
--- /dev/null   Fri Sep 12 02:18:42 2025
+++ pkgsrc/wm/afterstep/patches/patch-libAfterBase_mystring.c   Fri Sep 12 02:18:42 2025
@@ -0,0 +1,37 @@
+$NetBSD: patch-libAfterBase_mystring.c,v 1.1 2025/09/12 02:18:42 gutteridge Exp $
+
+Use ctype.h correctly.
+
+--- libAfterBase/mystring.c.orig       2013-05-01 13:34:11.000000000 +0000
++++ libAfterBase/mystring.c
+@@ -43,11 +43,11 @@ mystrcasecmp (const char *s1, const char
+               /* in some BSD implementations, tolower(c) is not defined
+                * unless isupper(c) is true */
+               c1 = s1[i];
+-              if (isupper (c1))
+-                      c1 = tolower (c1);
++              if (isupper((unsigned char)c1))
++                      c1 = tolower((unsigned char)c1);
+               c2 = s2[i];
+-              if (isupper (c2))
+-                      c2 = tolower (c2);
++              if (isupper((unsigned char)c2))
++                      c2 = tolower((unsigned char)c2);
+ 
+               ++i ;
+               if (c1 != c2)
+@@ -70,10 +70,10 @@ mystrncasecmp (const char *s1, const cha
+               ++i ;
+               if (c1==0)
+                       return -c2;
+-              if (isupper (c1))
+-                      c1 = tolower(c1);
+-              if (isupper (c2))
+-                      c2 = tolower(c2);
++              if (isupper((unsigned char)c1))
++                      c1 = tolower((unsigned char)c1);
++              if (isupper((unsigned char)c2))
++                      c2 = tolower((unsigned char)c2);
+               if (c1 != c2)
+                       return (c1 - c2);
+       }
Index: pkgsrc/wm/afterstep/patches/patch-src_afterstep_events.c
diff -u /dev/null pkgsrc/wm/afterstep/patches/patch-src_afterstep_events.c:1.1
--- /dev/null   Fri Sep 12 02:18:42 2025
+++ pkgsrc/wm/afterstep/patches/patch-src_afterstep_events.c    Fri Sep 12 02:18:42 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_afterstep_events.c,v 1.1 2025/09/12 02:18:42 gutteridge Exp $
+
+Need function prototype for XkbKeycodeToKeysym(3).
+
+--- src/afterstep/events.c.orig        2013-05-01 13:34:11.000000000 +0000
++++ src/afterstep/events.c
+@@ -45,6 +45,7 @@
+ #include "../../libAfterStep/wmprops.h"
+ #include "../../libAfterStep/moveresize.h"
+ 
++#include <X11/XKBlib.h>
+ #include <X11/keysym.h>
+ #ifdef XSHMIMAGE
+ # include <sys/ipc.h>
Index: pkgsrc/wm/afterstep/patches/patch-src_afterstep_menuitem.c
diff -u /dev/null pkgsrc/wm/afterstep/patches/patch-src_afterstep_menuitem.c:1.1
--- /dev/null   Fri Sep 12 02:18:42 2025
+++ pkgsrc/wm/afterstep/patches/patch-src_afterstep_menuitem.c  Fri Sep 12 02:18:42 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_afterstep_menuitem.c,v 1.1 2025/09/12 02:18:42 gutteridge Exp $
+
+Need function prototype for XkbKeycodeToKeysym(3).
+
+--- src/afterstep/menuitem.c.orig      2013-05-01 13:34:11.000000000 +0000
++++ src/afterstep/menuitem.c
+@@ -53,6 +53,8 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++#include <X11/XKBlib.h>
++
+ #include "dirtree.h"
+ 
+ /***************************************************************************/
+@@ -64,7 +66,7 @@ MenuData *FindPopup (const char *name, i
+ 
+       if (name == NULL) {
+               if (!quiet)
+-                      show_error ("Empty Popup name specifyed");
++                      show_error ("Empty Popup name specified");
+               return md;
+       }
+