CVS commit: pkgsrc/x11

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

Module Name:    pkgsrc
Committed By:   mrg
Date:           Fri Sep 19 06:24:26 UTC 2025

Modified Files:
        pkgsrc/x11/unclutter: distinfo
        pkgsrc/x11/xcb: distinfo
Added Files:
        pkgsrc/x11/unclutter/patches: patch-unclutter.c patch-vroot.h
        pkgsrc/x11/xcb/patches: patch-xcb.c

Log Message:
make build with GCC 14.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/unclutter/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/unclutter/patches/patch-unclutter.c \
    pkgsrc/x11/unclutter/patches/patch-vroot.h
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xcb/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xcb/patches/patch-xcb.c

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

Modified files:

Index: pkgsrc/x11/unclutter/distinfo
diff -u pkgsrc/x11/unclutter/distinfo:1.6 pkgsrc/x11/unclutter/distinfo:1.7
--- pkgsrc/x11/unclutter/distinfo:1.6   Tue Oct 26 11:34:30 2021
+++ pkgsrc/x11/unclutter/distinfo       Fri Sep 19 06:24:25 2025
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:34:30 nia Exp $
+$NetBSD: distinfo,v 1.7 2025/09/19 06:24:25 mrg Exp $
 
 BLAKE2s (unclutter-8.tar.Z) = a2e9c031d0052bf949028a8212468f8944426d0bb5cd5b9dae211267f043a1d7
 SHA512 (unclutter-8.tar.Z) = 9a64e6eceae685cf34b1ea85818735f8f85514ba1eea262476653886d74e469cfd6b9a39edbd098b138a5c89e6b97b42cf251bee59272c76cbeba190979744b4
 Size (unclutter-8.tar.Z) = 12344 bytes
+SHA1 (patch-unclutter.c) = a415c05f241d8e65b0639ab908c63f37c235e152
+SHA1 (patch-vroot.h) = 1eff860bf3b5bd4de263284adf4c8b18742da791

Index: pkgsrc/x11/xcb/distinfo
diff -u pkgsrc/x11/xcb/distinfo:1.8 pkgsrc/x11/xcb/distinfo:1.9
--- pkgsrc/x11/xcb/distinfo:1.8 Tue Oct 26 11:34:34 2021
+++ pkgsrc/x11/xcb/distinfo     Fri Sep 19 06:24:25 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:34:34 nia Exp $
+$NetBSD: distinfo,v 1.9 2025/09/19 06:24:25 mrg Exp $
 
 BLAKE2s (xcb-2.4.tar.gz) = dafbc054bfc14773e0b3ba5be32a3a36586c33d42c41be11dcf36d2ab863c410
 SHA512 (xcb-2.4.tar.gz) = cc612231cd61507a1af1a12fab7684b074ec99ec87e82bcba13dba215d4569c0605d3861f40d858f87da9b027c440a02f03b18a968c1d73ab08b8ee41e644948
 Size (xcb-2.4.tar.gz) = 19830 bytes
+SHA1 (patch-xcb.c) = 4208ed9ce5e83858d13e2912d8fb499637045c5e

Added files:

Index: pkgsrc/x11/unclutter/patches/patch-unclutter.c
diff -u /dev/null pkgsrc/x11/unclutter/patches/patch-unclutter.c:1.1
--- /dev/null   Fri Sep 19 06:24:26 2025
+++ pkgsrc/x11/unclutter/patches/patch-unclutter.c      Fri Sep 19 06:24:26 2025
@@ -0,0 +1,70 @@
+$NetBSD: patch-unclutter.c,v 1.1 2025/09/19 06:24:26 mrg Exp $
+
+Port to modern C.
+
+--- unclutter.c.orig   1994-04-11 08:40:47.000000000 -0700
++++ unclutter.c        2025-09-18 23:17:22.053941452 -0700
+@@ -24,13 +24,17 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xproto.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "vroot.h"
+ 
+ char *progname;
+-pexit(str)char *str;{
++void
++pexit(char *str)
++{
+     fprintf(stderr,"%s: %s\n",progname,str);
+     exit(1);
+ }
++void
+ usage(){
+     pexit("usage:\n\
+       -display <display>\n\
+@@ -58,9 +62,7 @@
+  * ignore these errors.
+  */
+ int (*defaulthandler)();
+-int errorhandler(display,error)
+-Display *display;
+-XErrorEvent *error;
++int errorhandler(Display *display, XErrorEvent *error)
+ {
+     if(error->error_code!=BadWindow)
+       (*defaulthandler)(display,error);
+@@ -72,9 +74,8 @@
+  * return true if window has a wm_name and the start of it matches
+  * one of the given names to avoid
+  */
+-nameinlist(display,window)
+-Display *display;
+-Window window;
++int
++nameinlist(Display *display, Window window)
+ {
+     char **cpp;
+     char *name;
+@@ -93,9 +94,8 @@
+ /*
+  * create a small 1x1 curssor with all pixels masked out on the given screen.
+  */
+-createnullcursor(display,root)
+-Display *display;
+-Window root;
++Cursor
++createnullcursor(Display *display, Window root)
+ {
+     Pixmap cursormask;
+     XGCValues xgc;
+@@ -117,7 +117,8 @@
+     return cursor;
+ }
+ 
+-main(argc,argv)char **argv;{
++int
++main(int argc, char **argv){
+     Display *display;
+     int screen,oldx = -99,oldy = -99,numscreens;
+     int doroot = 0, jitter = 0, idletime = 5, usegrabmethod = 0, waitagain = 0,
Index: pkgsrc/x11/unclutter/patches/patch-vroot.h
diff -u /dev/null pkgsrc/x11/unclutter/patches/patch-vroot.h:1.1
--- /dev/null   Fri Sep 19 06:24:26 2025
+++ pkgsrc/x11/unclutter/patches/patch-vroot.h  Fri Sep 19 06:24:26 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-vroot.h,v 1.1 2025/09/19 06:24:26 mrg Exp $
+
+Port to modern C.
+
+--- vroot.h.orig       1991-08-02 09:13:54.000000000 -0700
++++ vroot.h    2025-09-18 23:13:45.217089016 -0700
+@@ -38,8 +38,7 @@
+ #include <X11/Xatom.h>
+ 
+ static Window
+-VirtualRootWindow(dpy, screen)
+-Display *dpy;
++VirtualRootWindow(Display *dpy, int screen)
+ {
+       static Display *save_dpy = (Display *)0;
+       static int save_screen = -1;

Index: pkgsrc/x11/xcb/patches/patch-xcb.c
diff -u /dev/null pkgsrc/x11/xcb/patches/patch-xcb.c:1.1
--- /dev/null   Fri Sep 19 06:24:26 2025
+++ pkgsrc/x11/xcb/patches/patch-xcb.c  Fri Sep 19 06:24:25 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-xcb.c,v 1.1 2025/09/19 06:24:25 mrg Exp $
+
+Port to modern C.
+
+--- xcb.c.orig 2002-11-25 07:28:17.000000000 -0800
++++ xcb.c      2025-09-18 23:20:23.386617678 -0700
+@@ -1350,6 +1350,7 @@
+     }
+ }
+ 
++int
+ main (argc, argv)
+      int argc;
+      char **argv;