CVS commit: pkgsrc/x11/xpaste

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Mar 23 10:12:50 UTC 2026

Modified Files:
        pkgsrc/x11/xpaste: distinfo
        pkgsrc/x11/xpaste/patches: patch-aa patch-ab

Log Message:
xpaste: Fix build with recent gcc.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/xpaste/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xpaste/patches/patch-aa
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xpaste/patches/patch-ab

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

Modified files:

Index: pkgsrc/x11/xpaste/distinfo
diff -u pkgsrc/x11/xpaste/distinfo:1.9 pkgsrc/x11/xpaste/distinfo:1.10
--- pkgsrc/x11/xpaste/distinfo:1.9      Tue Oct 26 11:34:54 2021
+++ pkgsrc/x11/xpaste/distinfo  Mon Mar 23 10:12:50 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:34:54 nia Exp $
+$NetBSD: distinfo,v 1.10 2026/03/23 10:12:50 nia Exp $
 
 BLAKE2s (xpaste-1.1.shar.gz) = 3c02ebe2125dba1604536abb5c02aafd27e1433ff7d5424000921f6dfb7116ca
 SHA512 (xpaste-1.1.shar.gz) = 526d213b4a4b79d75b0a2f9f85d9e3874cb885cb7778555e621610f8c56d6c87de16515ffddd7f14986fe244902185618229c89309377c5df3e1781d3e30554c
 Size (xpaste-1.1.shar.gz) = 6144 bytes
-SHA1 (patch-aa) = 467ecb06be395db5222614beeaba6694eb44c1fc
-SHA1 (patch-ab) = 5d1fec1a6f1dfb500f5bdb49b4f2e126d1e5e3ed
+SHA1 (patch-aa) = 4c02fa8466db3064c2d7d88a0d1302b69df05098
+SHA1 (patch-ab) = 8f08438ba844eba711ad20a4be457eef00f06c95

Index: pkgsrc/x11/xpaste/patches/patch-aa
diff -u pkgsrc/x11/xpaste/patches/patch-aa:1.1 pkgsrc/x11/xpaste/patches/patch-aa:1.2
--- pkgsrc/x11/xpaste/patches/patch-aa:1.1      Mon Sep 29 09:20:12 2003
+++ pkgsrc/x11/xpaste/patches/patch-aa  Mon Mar 23 10:12:50 2026
@@ -1,19 +1,20 @@
-$NetBSD: patch-aa,v 1.1 2003/09/29 09:20:12 seb Exp $
+$NetBSD: patch-aa,v 1.2 2026/03/23 10:12:50 nia Exp $
 
---- Xju.c.orig 2003-09-29 08:30:33.000000000 +0000
+--- Xju.c.orig 2026-03-23 09:47:44.787227079 +0000
 +++ Xju.c
-@@ -5,3 +5,3 @@
+@@ -5,3 +5,4 @@
   */
 -#include <varargs.h>
++#include <stdio.h>
 +#include <stdarg.h>
  #include <X11/Intrinsic.h>
-@@ -11,4 +11,3 @@ extern Widget root;
+@@ -11,4 +12,3 @@ extern Widget root;
  
 -void SetArgs(va_alist)
 -va_dcl
 +void SetArgs(Arg **arglist, ...)
  {
-@@ -23,9 +22,6 @@ va_dcl
+@@ -23,9 +23,6 @@ va_dcl
        unsigned i;
 -      Arg **arglist;
        Cardinal *count;
@@ -24,7 +25,7 @@ $NetBSD: patch-aa,v 1.1 2003/09/29 09:20
 -      arglist = va_arg(argindex, Arg **);
 +      va_start(argindex, arglist);
        count = va_arg(argindex, Cardinal *);
-@@ -46,6 +42,5 @@ va_dcl
+@@ -46,6 +43,5 @@ va_dcl
        /* Set new Arg list */
 -      va_start(argindex);
 +      va_start(argindex, arglist);
@@ -32,13 +33,13 @@ $NetBSD: patch-aa,v 1.1 2003/09/29 09:20
        /* skip past first two arguments */
 -      (void) va_arg(argindex, Arg **);
        (void) va_arg(argindex, int *);
-@@ -60,4 +55,3 @@ va_dcl
+@@ -60,4 +56,3 @@ va_dcl
  
 -Widget CreateWidget(va_alist) 
 -va_dcl
 +Widget CreateWidget(char *name, ...) 
  {
-@@ -80,9 +74,7 @@ va_dcl
+@@ -80,9 +75,7 @@ va_dcl
        Widget w, parent;
 -      char *name;
        WidgetClass class;
@@ -49,7 +50,7 @@ $NetBSD: patch-aa,v 1.1 2003/09/29 09:20
        /* Get first three arguments */
 -      name = va_arg(argindex, char *);
        class = va_arg(argindex, WidgetClass);
-@@ -104,6 +96,5 @@ va_dcl
+@@ -104,6 +97,5 @@ va_dcl
        /* Set new Arg list */
 -      va_start(argindex);
 +      va_start(argindex, name);
@@ -57,13 +58,13 @@ $NetBSD: patch-aa,v 1.1 2003/09/29 09:20
        /* skip past first three arguments */
 -      (void) va_arg(argindex, char *);
        (void) va_arg(argindex, WidgetClass);
-@@ -125,4 +116,3 @@ va_dcl
+@@ -125,4 +117,3 @@ va_dcl
        
 -void QueryWidget(va_alist)
 -va_dcl
 +void QueryWidget(Widget w, ...)
  {
-@@ -140,8 +130,4 @@ va_dcl
+@@ -140,8 +131,4 @@ va_dcl
        Cardinal count;
 -      Widget w;
 -
@@ -73,7 +74,7 @@ $NetBSD: patch-aa,v 1.1 2003/09/29 09:20
 -      w = va_arg(argindex, Widget);
 +      va_start(argindex, w);
  
-@@ -161,6 +147,3 @@ va_dcl
+@@ -161,6 +148,3 @@ va_dcl
        /* Set new Arg list */
 -      va_start(argindex);
 -
@@ -81,13 +82,13 @@ $NetBSD: patch-aa,v 1.1 2003/09/29 09:20
 -      (void) va_arg(argindex, Widget);
 +      va_start(argindex, w);
  
-@@ -176,4 +159,3 @@ va_dcl
+@@ -176,4 +160,3 @@ va_dcl
        
 -void ConfigureWidget(va_alist)
 -va_dcl
 +void ConfigureWidget(Widget w, ...)
  {
-@@ -191,8 +173,4 @@ va_dcl
+@@ -191,8 +174,4 @@ va_dcl
        Cardinal count;
 -      Widget w;
  
@@ -97,7 +98,7 @@ $NetBSD: patch-aa,v 1.1 2003/09/29 09:20
 -      w = va_arg(argindex, Widget);
 +      va_start(argindex, w);
  
-@@ -212,6 +190,3 @@ va_dcl
+@@ -212,6 +191,3 @@ va_dcl
        /* Set new Arg list */
 -      va_start(argindex);
 -

Index: pkgsrc/x11/xpaste/patches/patch-ab
diff -u pkgsrc/x11/xpaste/patches/patch-ab:1.2 pkgsrc/x11/xpaste/patches/patch-ab:1.3
--- pkgsrc/x11/xpaste/patches/patch-ab:1.2      Mon Dec  5 20:51:20 2005
+++ pkgsrc/x11/xpaste/patches/patch-ab  Mon Mar 23 10:12:50 2026
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.2 2005/12/05 20:51:20 rillig Exp $
+$NetBSD: patch-ab,v 1.3 2026/03/23 10:12:50 nia Exp $
 
---- xpaste.c.orig      2003-11-18 07:23:53.000000000 +0000
+--- xpaste.c.orig      2026-03-23 09:47:44.790167961 +0000
 +++ xpaste.c
-@@ -18,7 +18,7 @@
+@@ -10,6 +10,7 @@ static char rcsid[] = "$Id: xpaste.c,v 1
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Xlib.h>
+ #include <X11/Intrinsic.h>
+@@ -18,7 +19,7 @@ static char rcsid[] = "$Id: xpaste.c,v 1
  #include <X11/Xaw/AsciiText.h>
  #include <X11/Xaw/Form.h>
  #include <X11/Xaw/Command.h>
@@ -11,3 +19,19 @@ $NetBSD: patch-ab,v 1.2 2005/12/05 20:51
  #include "patchlevel.h"
  
  #ifndef WIDTHPADDING
+@@ -60,6 +61,7 @@ static struct xpaste_res {
+ typedef struct xpaste_res *xpres;
+ extern char *getenv();
+ 
++int
+ main(argc, argv)
+ int argc;
+ char *argv[];
+@@ -133,6 +135,7 @@ char *argv[];
+ 
+       XtRealizeWidget(root);
+       XtMainLoop();
++      return 0;
+ }
+ 
+ void Xit(w, closure, call_data)