CVS commit: pkgsrc/sysutils/xps

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jun 18 16:07:13 UTC 2026

Modified Files:
        pkgsrc/sysutils/xps: distinfo
        pkgsrc/sysutils/xps/patches: patch-ab patch-ac
Added Files:
        pkgsrc/sysutils/xps/patches: patch-src_FreeBSD_loadavg.c
            patch-src_NetBSD_loadavg.c patch-src_callback.c

Log Message:
xps: Various build fixes for GCC 14.

Include config.h before any #if checks are done, so that they actually
pass.

This is necessary so that stdlib.h gets correctly included, otherwise
it implicitly declares loadavg(3) and fails to build with a modern
compiler.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/xps/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/xps/patches/patch-ab
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/xps/patches/patch-ac
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xps/patches/patch-src_FreeBSD_loadavg.c \
    pkgsrc/sysutils/xps/patches/patch-src_NetBSD_loadavg.c \
    pkgsrc/sysutils/xps/patches/patch-src_callback.c

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

Modified files:

Index: pkgsrc/sysutils/xps/distinfo
diff -u pkgsrc/sysutils/xps/distinfo:1.10 pkgsrc/sysutils/xps/distinfo:1.11
--- pkgsrc/sysutils/xps/distinfo:1.10   Tue Oct 26 11:20:28 2021
+++ pkgsrc/sysutils/xps/distinfo        Thu Jun 18 16:07:13 2026
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 11:20:28 nia Exp $
+$NetBSD: distinfo,v 1.11 2026/06/18 16:07:13 nia Exp $
 
 BLAKE2s (xps-4.2.tar.gz) = e866b60e67ef25b64ed98495e70f05e454292948ea4e7633263deb06c9216f12
 SHA512 (xps-4.2.tar.gz) = 036cfe5c638ee6ec917da6916ef00bc43c57a4bf80c0c2e5f15964f8d2e3ef312ee89ce56d41a07168c2a6097384f0faa968e5ba77dde22516c85357ec14412a
 Size (xps-4.2.tar.gz) = 279690 bytes
 SHA1 (patch-aa) = 6e1b162b46fa7a35d64a787c49abdfbc66cea431
-SHA1 (patch-ab) = 6a0b0aa8d34010da75573d3084fc4989af2c635c
-SHA1 (patch-ac) = 6a94bd17251f440c2af8302b0c842191420e4efc
+SHA1 (patch-ab) = 6f9c84ee6fe1829b1db03a3a2d5a7b35fe591295
+SHA1 (patch-ac) = 5308b58c45f2811fa7f5fe82e6d4a439d6c694d8
+SHA1 (patch-src_FreeBSD_loadavg.c) = 4dfcd6b7e66fd5b86778ec68e2b7f4e053c03234
+SHA1 (patch-src_NetBSD_loadavg.c) = cc9eebf35b2acf40bbc95d0cee3742938666da8b
+SHA1 (patch-src_callback.c) = 8cdcc9c5bccfaca817c6f6632c65c38c9597eac9

Index: pkgsrc/sysutils/xps/patches/patch-ab
diff -u pkgsrc/sysutils/xps/patches/patch-ab:1.3 pkgsrc/sysutils/xps/patches/patch-ab:1.4
--- pkgsrc/sysutils/xps/patches/patch-ab:1.3    Wed Jun 21 20:41:27 2006
+++ pkgsrc/sysutils/xps/patches/patch-ab        Thu Jun 18 16:07:13 2026
@@ -1,18 +1,26 @@
-$NetBSD: patch-ab,v 1.3 2006/06/21 20:41:27 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2026/06/18 16:07:13 nia Exp $
 
---- src/FreeBSD/os.c.orig      2006-06-21 20:12:56.000000000 +0000
+--- src/FreeBSD/os.c.orig      2002-12-01 23:56:11.000000000 +0000
 +++ src/FreeBSD/os.c
-@@ -125,16 +125,27 @@ GetStatus(ProcInfo *p)
+@@ -24,6 +24,7 @@
+ #include "config.h"
+ #include "os.h"
+ #include <fcntl.h>
++#include <stdlib.h>
+ #include <limits.h>
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+@@ -125,16 +126,27 @@ GetStatus(ProcInfo *p)
    if (!active.allprocs) {
  #ifdef HAVE_REGEX
      if (active.match_regexp) {
 +#if defined(__DragonFly__)
-+      int regmatch = regexec(&active.re_pat, 
+       int regmatch = regexec(&active.re_pat, 
 +                           IDtouser(proc->kp_eproc.e_ucred.cr_ruid), 
 +                           (size_t) NULL, (regmatch_t *) NULL,
 +                           REG_NOTBOL|REG_NOTEOL);
 +#else
-       int regmatch = regexec(&active.re_pat, 
++      int regmatch = regexec(&active.re_pat, 
                             IDtouser(proc->kp_eproc.e_pcred.p_ruid), 
                             (size_t) NULL, (regmatch_t *) NULL,
                             REG_NOTBOL|REG_NOTEOL);
@@ -30,7 +38,7 @@ $NetBSD: patch-ab,v 1.3 2006/06/21 20:41
        return False;
  #ifdef HAVE_REGEX
      }
-@@ -166,8 +177,10 @@ GetStatus(ProcInfo *p)
+@@ -166,8 +178,10 @@ GetStatus(ProcInfo *p)
  
    if (proc->kp_proc.p_pid == MyPid && !cmd_options.me_too)
      pstat = SSLEEP;
@@ -41,7 +49,7 @@ $NetBSD: patch-ab,v 1.3 2006/06/21 20:41
    else
      pstat = proc->kp_proc.p_stat;
  
-@@ -179,7 +192,11 @@ void 
+@@ -179,7 +193,11 @@ GetProcName(ProcInfo *p, TREENODE *node)
  GetProcName(ProcInfo *p, TREENODE *node)
  {
    ProcInfo proc = *p;
@@ -53,7 +61,7 @@ $NetBSD: patch-ab,v 1.3 2006/06/21 20:41
  
    if (proc->kp_proc.p_stat == SZOMB)
      strcpy(node->label, "*zombie*");
-@@ -196,9 +213,15 @@ GetProcName(ProcInfo *p, TREENODE *node)
+@@ -196,9 +214,15 @@ GetProcName(ProcInfo *p, TREENODE *node)
  
        /* We've got a sleeping process. (Hopefully that's the majority of 
         the processes. Assign a color based on userid. */
@@ -69,7 +77,7 @@ $NetBSD: patch-ab,v 1.3 2006/06/21 20:41
        strcpy(node->label1, username);
        } else {
        strcpy(node->label1, UNKNOWN_USER);
-@@ -209,7 +232,11 @@ GetProcName(ProcInfo *p, TREENODE *node)
+@@ -209,7 +233,11 @@ GetProcName(ProcInfo *p, TREENODE *node)
  #ifdef XPS_RECOLOR_LOGIN_PROCESSES      
        for (i=0;i<NUMLABS ;i++ ) {
        if (strcmp(node->label, label_array[i]) == 0) {

Index: pkgsrc/sysutils/xps/patches/patch-ac
diff -u pkgsrc/sysutils/xps/patches/patch-ac:1.2 pkgsrc/sysutils/xps/patches/patch-ac:1.3
--- pkgsrc/sysutils/xps/patches/patch-ac:1.2    Tue Nov  9 12:30:40 2004
+++ pkgsrc/sysutils/xps/patches/patch-ac        Thu Jun 18 16:07:13 2026
@@ -1,8 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2004/11/09 12:30:40 adam Exp $
+$NetBSD: patch-ac,v 1.3 2026/06/18 16:07:13 nia Exp $
 
 --- src/NetBSD/os.c.orig       2003-04-24 00:21:29.000000000 +0000
 +++ src/NetBSD/os.c
-@@ -166,8 +166,10 @@ GetStatus(ProcInfo *p)
+@@ -24,6 +24,7 @@
+ #include "user_config.h"
+ #include "os.h"
+ #include <fcntl.h>
++#include <stdlib.h>
+ #include <limits.h>
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+@@ -166,8 +167,10 @@ GetStatus(ProcInfo *p)
  
    if (proc->kp_proc.p_pid == MyPid && !cmd_options.me_too)
      pstat = SSLEEP;

Added files:

Index: pkgsrc/sysutils/xps/patches/patch-src_FreeBSD_loadavg.c
diff -u /dev/null pkgsrc/sysutils/xps/patches/patch-src_FreeBSD_loadavg.c:1.1
--- /dev/null   Thu Jun 18 16:07:13 2026
+++ pkgsrc/sysutils/xps/patches/patch-src_FreeBSD_loadavg.c     Thu Jun 18 16:07:13 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_FreeBSD_loadavg.c,v 1.1 2026/06/18 16:07:13 nia Exp $
+
+Include config.h before any #if checks are done, so that they actually
+pass.
+
+This is necessary so that stdlib.h gets correctly included, otherwise
+it implicitly declares loadavg(3) and fails to build with a modern
+compiler.
+
+--- src/FreeBSD/loadavg.c.orig 2026-06-18 16:00:24.941272671 +0000
++++ src/FreeBSD/loadavg.c
+@@ -3,2 +3,3 @@
+  */
++#include "config.h"
+ #include "loadavg.h"
Index: pkgsrc/sysutils/xps/patches/patch-src_NetBSD_loadavg.c
diff -u /dev/null pkgsrc/sysutils/xps/patches/patch-src_NetBSD_loadavg.c:1.1
--- /dev/null   Thu Jun 18 16:07:13 2026
+++ pkgsrc/sysutils/xps/patches/patch-src_NetBSD_loadavg.c      Thu Jun 18 16:07:13 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_NetBSD_loadavg.c,v 1.1 2026/06/18 16:07:13 nia Exp $
+
+Include config.h before any #if checks are done, so that they actually
+pass.
+
+This is necessary so that stdlib.h gets correctly included, otherwise
+it implicitly declares loadavg(3) and fails to build with a modern
+compiler.
+
+--- src/NetBSD/loadavg.c.orig  2026-06-18 16:00:02.062571046 +0000
++++ src/NetBSD/loadavg.c
+@@ -3,2 +3,3 @@
+  */
++#include "config.h"
+ #include "loadavg.h"
Index: pkgsrc/sysutils/xps/patches/patch-src_callback.c
diff -u /dev/null pkgsrc/sysutils/xps/patches/patch-src_callback.c:1.1
--- /dev/null   Thu Jun 18 16:07:13 2026
+++ pkgsrc/sysutils/xps/patches/patch-src_callback.c    Thu Jun 18 16:07:13 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_callback.c,v 1.1 2026/06/18 16:07:13 nia Exp $
+
+Avoid implicit declaration of exit(3).
+
+--- src/callback.c.orig        2003-04-24 00:21:29.000000000 +0000
++++ src/callback.c
+@@ -24,6 +24,7 @@
+ #include "user_config.h"
+ #include "os.h"
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "xstuff.h"
+ #include "callback.h"
+ #include "common.h"