CVS commit: pkgsrc/wm/vtwm

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jun 18 19:16:59 UTC 2026

Modified Files:
        pkgsrc/wm/vtwm: Makefile distinfo
Added Files:
        pkgsrc/wm/vtwm/patches: patch-add__window.c

Log Message:
vtwm: Various build fixes for GCC 14 & GCC 15.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/wm/vtwm/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/wm/vtwm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/vtwm/patches/patch-add__window.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/vtwm/Makefile
diff -u pkgsrc/wm/vtwm/Makefile:1.17 pkgsrc/wm/vtwm/Makefile:1.18
--- pkgsrc/wm/vtwm/Makefile:1.17        Sat Jan 11 14:47:07 2025
+++ pkgsrc/wm/vtwm/Makefile     Thu Jun 18 19:16:59 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2025/01/11 14:47:07 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2026/06/18 19:16:59 nia Exp $
 
 DISTNAME=      vtwm-5.5.0
 PKGREVISION=   4
@@ -14,6 +14,13 @@ GNU_CONFIGURE=       yes
 
 USE_TOOLS+=    pkg-config flex bison m4
 
+# vtwm contains old (K&R) style function definitions which
+# are forbidden in C23. As safety against further developments
+# in the C standard, pick a reasonable one, in this case
+# the minimum bootstrap requirement with extensions enabled
+# to expose all system APIs.
+FORCE_C_STD=           gnu99
+
 CONFIGURE_ARGS+=       --disable-esd-sound
 CONFIGURE_ARGS+=       --disable-rplay-sound
 

Index: pkgsrc/wm/vtwm/distinfo
diff -u pkgsrc/wm/vtwm/distinfo:1.7 pkgsrc/wm/vtwm/distinfo:1.8
--- pkgsrc/wm/vtwm/distinfo:1.7 Sat Jan 11 14:47:07 2025
+++ pkgsrc/wm/vtwm/distinfo     Thu Jun 18 19:16:59 2026
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2025/01/11 14:47:07 wiz Exp $
+$NetBSD: distinfo,v 1.8 2026/06/18 19:16:59 nia Exp $
 
 BLAKE2s (vtwm-5.5.0.tar.gz) = 006e9411bce75339fa158270ce6df39eeddcc28c2ce497031c916fb539957780
 SHA512 (vtwm-5.5.0.tar.gz) = cf0b7bc2c007fea9df909d695098cc5ab5ab9fbb83b58264a3fc380aa5db83411c3ebec9f238fb23fdfcacdf9ae289ece7c14831d6839e606031d587fc7d73af
 Size (vtwm-5.5.0.tar.gz) = 1141664 bytes
+SHA1 (patch-add__window.c) = c745f085a7b8b6c8efdc5c31054ce1d8bf7711f2
 SHA1 (patch-events.c) = da40cffecbf8af629ff16c32341476f048700dc5
 SHA1 (patch-menus.c) = 1fc10cc7b8d74cd939eed8f3dd73e0acefd8668f

Added files:

Index: pkgsrc/wm/vtwm/patches/patch-add__window.c
diff -u /dev/null pkgsrc/wm/vtwm/patches/patch-add__window.c:1.1
--- /dev/null   Thu Jun 18 19:16:59 2026
+++ pkgsrc/wm/vtwm/patches/patch-add__window.c  Thu Jun 18 19:16:59 2026
@@ -0,0 +1,19 @@
+$NetBSD: patch-add__window.c,v 1.1 2026/06/18 19:16:59 nia Exp $
+
+Avoid implicit int, it's forbidden by newer GCC versions.
+
+--- add_window.c.orig  2026-06-18 19:05:04.920108763 +0000
++++ add_window.c
+@@ -457,9 +457,9 @@ AddWindow(Window w, int iconm, IconMgr * iconp)
+   if (Scr->StormPositioning && HandlingEvents == TRUE &&
+       !(tmp_win->hints.flags & USPosition) && (tmp_win->group != tmp_win->w))
+   {
+-    static lastwingroup = 0;
+-    static lastwin = 0;
+-    static lasttime = 0;
++    static int lastwingroup = 0;
++    static int lastwin = 0;
++    static int lasttime = 0;
+     int curtime = time(NULL);
+     Window junk;
+