diff options
author | wiz <wiz@pkgsrc.org> | 2002-03-20 01:52:31 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2002-03-20 01:52:31 +0000 |
commit | adf02253685456d33e7a3b7b2c136bd93cb0ca92 (patch) | |
tree | e8966df8975af5a8f261fc54e600743121dca786 /x11/xdm3d | |
parent | af46fd0e16188f89a943c7fbd6145e32f96fe5d5 (diff) | |
download | pkgsrc-adf02253685456d33e7a3b7b2c136bd93cb0ca92.tar.gz |
Add RCS ids to patch-ac and patch-ab.
New patch-ad fixes problem with unset loginmoveInterval resource,
reported (including patch) by Robert Elz in pkg/15040.
Diffstat (limited to 'x11/xdm3d')
-rw-r--r-- | x11/xdm3d/distinfo | 7 | ||||
-rw-r--r-- | x11/xdm3d/patches/patch-ab | 2 | ||||
-rw-r--r-- | x11/xdm3d/patches/patch-ac | 2 | ||||
-rw-r--r-- | x11/xdm3d/patches/patch-ad | 32 |
4 files changed, 40 insertions, 3 deletions
diff --git a/x11/xdm3d/distinfo b/x11/xdm3d/distinfo index c1b8ad85f8c..62a78daad4f 100644 --- a/x11/xdm3d/distinfo +++ b/x11/xdm3d/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.3 2002/03/20 01:49:23 wiz Exp $ +$NetBSD: distinfo,v 1.4 2002/03/20 01:52:31 wiz Exp $ SHA1 (xdm3d-1.0.tar.gz) = 494a33aefee0c1545331b657bf47b90634b69648 Size (xdm3d-1.0.tar.gz) = 157858 bytes SHA1 (patch-aa) = 4a86a37ad238e502352346fa86090b7578d862ee -SHA1 (patch-ab) = 4e61db30ef609a194629482355e91858803698ca -SHA1 (patch-ac) = a9a2ea520168d18e8178ef12010be72a2b8d3727 +SHA1 (patch-ab) = b8d5c7a705d9abdec06fa139196605484dde679a +SHA1 (patch-ac) = 9ea05506db86d181d9826f5c668899b7e760a8aa +SHA1 (patch-ad) = fe87f070a74e6525908aa81cb2242a0d3e1ccd8a diff --git a/x11/xdm3d/patches/patch-ab b/x11/xdm3d/patches/patch-ab index 0517455987e..bfdb11edb21 100644 --- a/x11/xdm3d/patches/patch-ab +++ b/x11/xdm3d/patches/patch-ab @@ -1,3 +1,5 @@ +$NetBSD: patch-ab,v 1.2 2002/03/20 01:52:31 wiz Exp $ + --- Imakefile.orig Tue Aug 18 16:51:04 1998 +++ Imakefile Sun Dec 23 11:46:41 2001 @@ -4,7 +4,7 @@ diff --git a/x11/xdm3d/patches/patch-ac b/x11/xdm3d/patches/patch-ac index 73194f65c67..b6fa17a5d8e 100644 --- a/x11/xdm3d/patches/patch-ac +++ b/x11/xdm3d/patches/patch-ac @@ -1,3 +1,5 @@ +$NetBSD: patch-ac,v 1.2 2002/03/20 01:52:31 wiz Exp $ + --- xdmshell.c.orig Fri Aug 22 16:42:11 1997 +++ xdmshell.c Sun Dec 23 16:42:32 2001 @@ -186,7 +186,7 @@ diff --git a/x11/xdm3d/patches/patch-ad b/x11/xdm3d/patches/patch-ad new file mode 100644 index 00000000000..8b56f8eb9a2 --- /dev/null +++ b/x11/xdm3d/patches/patch-ad @@ -0,0 +1,32 @@ +$NetBSD: patch-ad,v 1.1 2002/03/20 01:52:31 wiz Exp $ + +--- greeter/greet.c.orig Tue Aug 18 16:24:56 1998 ++++ greeter/greet.c Sun Dec 23 23:45:13 2001 +@@ -122,6 +122,9 @@ + + d = (struct display *) closure; + ++if (d->loginmoveInterval <= 0) ++ return; ++ + scrn = XDefaultScreenOfDisplay(dpy); + /* + XtSetArg (args[0], XtNwidth, (XtArgVal) &width); +@@ -255,7 +258,7 @@ + 0, 0, 0, 0, + XWidthOfScreen(scrn) / 2, + XHeightOfScreen(scrn) / 2); +- if (d->loginmoveInterval > -1) ++ if (d->loginmoveInterval > 0) + moveTimeout = XtAppAddTimeOut (context, d->loginmoveInterval*10000, time_test, (XtPointer) d); + + if (d->pingInterval) +@@ -315,7 +318,7 @@ + while (!done) { + XtAppNextEvent (context, &event); + /* by Amit Margalit 19-Apr-1997 */ +- if(event.type == KeyPress) ++ if(moveTimeout && event.type == KeyPress) + { /* reset the timeout as long as we type it stays in place */ + XtMoveWidget(toplevel,orig_x,orig_y); + XtRemoveTimeOut(moveTimeout); |