CVS commit: pkgsrc/wm/vtwm

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jan 11 14:47:07 UTC 2025

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

Log Message:
vtwm: apply fix PR 58979 (twm) for vtwm

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/wm/vtwm/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/wm/vtwm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/vtwm/patches/patch-events.c \
    pkgsrc/wm/vtwm/patches/patch-menus.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.16 pkgsrc/wm/vtwm/Makefile:1.17
--- pkgsrc/wm/vtwm/Makefile:1.16        Sun Nov 12 13:23:51 2023
+++ pkgsrc/wm/vtwm/Makefile     Sat Jan 11 14:47:07 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2023/11/12 13:23:51 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2025/01/11 14:47:07 wiz Exp $
 
 DISTNAME=      vtwm-5.5.0
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=vtwm/}
 

Index: pkgsrc/wm/vtwm/distinfo
diff -u pkgsrc/wm/vtwm/distinfo:1.6 pkgsrc/wm/vtwm/distinfo:1.7
--- pkgsrc/wm/vtwm/distinfo:1.6 Tue Oct 26 11:25:19 2021
+++ pkgsrc/wm/vtwm/distinfo     Sat Jan 11 14:47:07 2025
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:25:19 nia Exp $
+$NetBSD: distinfo,v 1.7 2025/01/11 14:47:07 wiz 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-events.c) = da40cffecbf8af629ff16c32341476f048700dc5
+SHA1 (patch-menus.c) = 1fc10cc7b8d74cd939eed8f3dd73e0acefd8668f

Added files:

Index: pkgsrc/wm/vtwm/patches/patch-events.c
diff -u /dev/null pkgsrc/wm/vtwm/patches/patch-events.c:1.1
--- /dev/null   Sat Jan 11 14:47:07 2025
+++ pkgsrc/wm/vtwm/patches/patch-events.c       Sat Jan 11 14:47:07 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-events.c,v 1.1 2025/01/11 14:47:07 wiz Exp $
+
+Apply fix for PR 58979 (twm) for vtwm.
+
+--- events.c.orig      2018-04-21 01:39:31.000000000 -0400
++++ events.c   2025-01-11 09:08:42.572757158 -0500
+@@ -3145,7 +3145,9 @@ HandleLeaveNotify(void)
+     if (FocusRoot)
+     {
+ 
+-      if (Event.xcrossing.detail != NotifyInferior)
++      if (Event.xcrossing.detail != NotifyInferior &&
++        Event.xcrossing.detail != NotifyVirtual &&
++        Event.xcrossing.detail != NotifyNonlinearVirtual)
+       {
+ 
+       /*
Index: pkgsrc/wm/vtwm/patches/patch-menus.c
diff -u /dev/null pkgsrc/wm/vtwm/patches/patch-menus.c:1.1
--- /dev/null   Sat Jan 11 14:47:07 2025
+++ pkgsrc/wm/vtwm/patches/patch-menus.c        Sat Jan 11 14:47:07 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-menus.c,v 1.1 2025/01/11 14:47:07 wiz Exp $
+
+Add missing header.
+
+--- menus.c.orig       2018-04-21 01:39:31.000000000 -0400
++++ menus.c    2025-01-09 09:15:07.326476249 -0500
+@@ -39,6 +39,7 @@
+ #include <X11/Xos.h>
+ #ifndef NO_REGEX_SUPPORT
+ #include <sys/types.h>
++#include <sys/wait.h>
+ #include <regex.h>
+ #endif
+ #include <stdlib.h>