diff options
| author | dholland <dholland@pkgsrc.org> | 2012-01-08 00:33:34 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2012-01-08 00:33:34 +0000 |
| commit | 09cba78ba3acec76164da5c3424acfdb93bd6601 (patch) | |
| tree | acb969ecbba63d8c360fa950f75e4833cf26f437 /x11/xdm3d | |
| parent | 6e7e5f13df48a41e8039ae17a49bdfd3b937505b (diff) | |
| download | pkgsrc-09cba78ba3acec76164da5c3424acfdb93bd6601.tar.gz | |
This file has a backslash-escaped trailing space after the login
prompt string, which I assume is there on purpose. Unfortunately, it
seems that when run through modern gcc's cpp, as at least Dragonfly's
current X resources processing pipeline apparently does, cpp treats
this as backslash-newline and splices on the next line, which causes
everything to go wahooni-shaped.
As a hack/workaround, insert a blank line after this line, so if the
next line does get spliced on it won't break things.
Reported by Artem Falcon.
Diffstat (limited to 'x11/xdm3d')
| -rw-r--r-- | x11/xdm3d/Makefile | 4 | ||||
| -rw-r--r-- | x11/xdm3d/distinfo | 3 | ||||
| -rw-r--r-- | x11/xdm3d/patches/patch-Xresources_3D | 22 |
3 files changed, 26 insertions, 3 deletions
diff --git a/x11/xdm3d/Makefile b/x11/xdm3d/Makefile index 91d86dbc649..2d1f9926101 100644 --- a/x11/xdm3d/Makefile +++ b/x11/xdm3d/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2011/12/20 05:00:58 dholland Exp $ +# $NetBSD: Makefile,v 1.25 2012/01/08 00:33:34 dholland Exp $ DISTNAME= xdm3d-1.0 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_LOCAL} diff --git a/x11/xdm3d/distinfo b/x11/xdm3d/distinfo index bd4d6c80e5f..6256c6be579 100644 --- a/x11/xdm3d/distinfo +++ b/x11/xdm3d/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.8 2011/12/13 04:40:31 dholland Exp $ +$NetBSD: distinfo,v 1.9 2012/01/08 00:33:34 dholland Exp $ SHA1 (xdm3d-1.0.tar.gz) = 494a33aefee0c1545331b657bf47b90634b69648 RMD160 (xdm3d-1.0.tar.gz) = 6a60c3afaf0756fc2c04256a79c61d413ee1a473 Size (xdm3d-1.0.tar.gz) = 157858 bytes +SHA1 (patch-Xresources_3D) = db96d677d89ee86bad76785ac2bd254d902a0876 SHA1 (patch-aa) = 4a86a37ad238e502352346fa86090b7578d862ee SHA1 (patch-ab) = 512f3df37f5480203c99198760fe98e2e127ae15 SHA1 (patch-ac) = 9ea05506db86d181d9826f5c668899b7e760a8aa diff --git a/x11/xdm3d/patches/patch-Xresources_3D b/x11/xdm3d/patches/patch-Xresources_3D new file mode 100644 index 00000000000..6e336c06a8e --- /dev/null +++ b/x11/xdm3d/patches/patch-Xresources_3D @@ -0,0 +1,22 @@ +$NetBSD: patch-Xresources_3D,v 1.1 2012/01/08 00:33:34 dholland Exp $ + +Apparently at least one X resources processing chain treats the +backslash-space-newline sequence below as just backslash-newline, +which makes a mess. Insert a blank line to mitigate the effect. + +Arguably this shouldn't be using backslash-space, but presumably it +wants a space after the login prompt and without the backslash there's +probably something else that will fail or drop it. + +This hack should at least be harmless. + +--- Xresources.3D~ 1998-08-18 09:17:37.000000000 +0000 ++++ Xresources.3D +@@ -6,6 +6,7 @@ xlogin*login.translations: #override\ + <Key>Return: set-session-argument() finish-field() + xlogin*greeting: CLIENTHOST + xlogin*namePrompt: login:\ ++ + xlogin*fail: Login incorrect + xlogin*y: 380 + #ifdef COLOR |