diff options
author | seb <seb@pkgsrc.org> | 2003-09-29 09:20:12 +0000 |
---|---|---|
committer | seb <seb@pkgsrc.org> | 2003-09-29 09:20:12 +0000 |
commit | 04cb239af6801c1bcc0e01f55683907e78e65407 (patch) | |
tree | 90398dd0424b385007bb606afe716466466a79e7 /x11 | |
parent | e3f927fc8d66aed11e7ef0d249df3b02b2dab2b7 (diff) | |
download | pkgsrc-04cb239af6801c1bcc0e01f55683907e78e65407.tar.gz |
Fix varargs problems encountered with gcc 3.
While here fix my email address.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/xpaste/Makefile | 4 | ||||
-rw-r--r-- | x11/xpaste/distinfo | 3 | ||||
-rw-r--r-- | x11/xpaste/patches/patch-aa | 107 |
3 files changed, 111 insertions, 3 deletions
diff --git a/x11/xpaste/Makefile b/x11/xpaste/Makefile index d1b0163cb90..f26c0fd0870 100644 --- a/x11/xpaste/Makefile +++ b/x11/xpaste/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/03/29 12:43:14 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2003/09/29 09:20:12 seb Exp $ # DISTNAME= xpaste-1.1 @@ -8,7 +8,7 @@ CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/} EXTRACT_SUFX= .shar.gz -MAINTAINER= seb@pbox.org +MAINTAINER= seb@NetBSD.org COMMENT= Display the content of the X11 paste buffer in a window USE_IMAKE= yes diff --git a/x11/xpaste/distinfo b/x11/xpaste/distinfo index 7948089cb19..3a1c3377636 100644 --- a/x11/xpaste/distinfo +++ b/x11/xpaste/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/05/21 05:43:24 zuntum Exp $ +$NetBSD: distinfo,v 1.3 2003/09/29 09:20:12 seb Exp $ SHA1 (xpaste-1.1.shar.gz) = 15c022ddb3e43bc25721e9185aebe5d5ef8160a2 Size (xpaste-1.1.shar.gz) = 6144 bytes +SHA1 (patch-aa) = 467ecb06be395db5222614beeaba6694eb44c1fc diff --git a/x11/xpaste/patches/patch-aa b/x11/xpaste/patches/patch-aa new file mode 100644 index 00000000000..fbe67855b28 --- /dev/null +++ b/x11/xpaste/patches/patch-aa @@ -0,0 +1,107 @@ +$NetBSD: patch-aa,v 1.1 2003/09/29 09:20:12 seb Exp $ + +--- Xju.c.orig 2003-09-29 08:30:33.000000000 +0000 ++++ Xju.c +@@ -5,3 +5,3 @@ + */ +-#include <varargs.h> ++#include <stdarg.h> + #include <X11/Intrinsic.h> +@@ -11,4 +11,3 @@ extern Widget root; + +-void SetArgs(va_alist) +-va_dcl ++void SetArgs(Arg **arglist, ...) + { +@@ -23,9 +22,6 @@ va_dcl + unsigned i; +- Arg **arglist; + Cardinal *count; + +- va_start(argindex); +- + /* Get first two arguments */ +- arglist = va_arg(argindex, Arg **); ++ va_start(argindex, arglist); + count = va_arg(argindex, Cardinal *); +@@ -46,6 +42,5 @@ va_dcl + /* Set new Arg list */ +- va_start(argindex); ++ va_start(argindex, arglist); + + /* skip past first two arguments */ +- (void) va_arg(argindex, Arg **); + (void) va_arg(argindex, int *); +@@ -60,4 +55,3 @@ va_dcl + +-Widget CreateWidget(va_alist) +-va_dcl ++Widget CreateWidget(char *name, ...) + { +@@ -80,9 +74,7 @@ va_dcl + Widget w, parent; +- char *name; + WidgetClass class; + +- va_start(argindex); ++ va_start(argindex, name); + + /* Get first three arguments */ +- name = va_arg(argindex, char *); + class = va_arg(argindex, WidgetClass); +@@ -104,6 +96,5 @@ va_dcl + /* Set new Arg list */ +- va_start(argindex); ++ va_start(argindex, name); + + /* skip past first three arguments */ +- (void) va_arg(argindex, char *); + (void) va_arg(argindex, WidgetClass); +@@ -125,4 +116,3 @@ va_dcl + +-void QueryWidget(va_alist) +-va_dcl ++void QueryWidget(Widget w, ...) + { +@@ -140,8 +130,4 @@ va_dcl + Cardinal count; +- Widget w; +- +- va_start(argindex); + +- /* Get first argument */ +- w = va_arg(argindex, Widget); ++ va_start(argindex, w); + +@@ -161,6 +147,3 @@ va_dcl + /* Set new Arg list */ +- va_start(argindex); +- +- /* skip past first argument */ +- (void) va_arg(argindex, Widget); ++ va_start(argindex, w); + +@@ -176,4 +159,3 @@ va_dcl + +-void ConfigureWidget(va_alist) +-va_dcl ++void ConfigureWidget(Widget w, ...) + { +@@ -191,8 +173,4 @@ va_dcl + Cardinal count; +- Widget w; + +- va_start(argindex); +- +- /* Get first argument */ +- w = va_arg(argindex, Widget); ++ va_start(argindex, w); + +@@ -212,6 +190,3 @@ va_dcl + /* Set new Arg list */ +- va_start(argindex); +- +- /* skip past first argument */ +- (void) va_arg(argindex, Widget); ++ va_start(argindex, w); + |