diff options
| author | abs <abs@pkgsrc.org> | 2003-05-18 21:09:07 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2003-05-18 21:09:07 +0000 |
| commit | 74b518aa9aede7f568545898c3fef167bb0e99c6 (patch) | |
| tree | a725410ca6b49a7330b03656d74b477038fdd016 /wm/golem | |
| parent | 6f3c5aef75ab39ea67484eecd3757a0628177baa (diff) | |
| download | pkgsrc-74b518aa9aede7f568545898c3fef167bb0e99c6.tar.gz | |
Update golem to 0.0.5nb1 - handle invalid keysyms and allow numeric keycodes
with KeyCodeNNN. Patch sent to and accepted by maintainer.
Diffstat (limited to 'wm/golem')
| -rw-r--r-- | wm/golem/Makefile | 3 | ||||
| -rw-r--r-- | wm/golem/distinfo | 4 | ||||
| -rw-r--r-- | wm/golem/patches/patch-ab | 31 |
3 files changed, 31 insertions, 7 deletions
diff --git a/wm/golem/Makefile b/wm/golem/Makefile index 5080f2e8857..c2b82f2b45c 100644 --- a/wm/golem/Makefile +++ b/wm/golem/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/05/15 11:19:39 salo Exp $ +# $NetBSD: Makefile,v 1.2 2003/05/18 21:09:07 abs Exp $ # DISTNAME= golem-0.0.5 +PKGREVISION= 1 CATEGORIES= wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=golem/} diff --git a/wm/golem/distinfo b/wm/golem/distinfo index bd6765d3a18..0dcb342ca3e 100644 --- a/wm/golem/distinfo +++ b/wm/golem/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/05/15 11:19:39 salo Exp $ +$NetBSD: distinfo,v 1.2 2003/05/18 21:09:07 abs Exp $ SHA1 (golem-0.0.5.tar.gz) = 5939acf109502a2f962e20fa933b31970fb2ed74 Size (golem-0.0.5.tar.gz) = 748348 bytes SHA1 (patch-aa) = 2c2bb75dce922316a3360cc4e0fdcfdc97209527 -SHA1 (patch-ab) = b9dc76afd9aecc96699944951d592c99b9d60c2f +SHA1 (patch-ab) = 9b874fff5141aacf784b833f0bf5150883ad2255 SHA1 (patch-ac) = c3e61f79f0783aaaa06723f53029a7b67b1a2a9c SHA1 (patch-ad) = ca2f91ea4587148543811729c8afc8e474b1c1ba diff --git a/wm/golem/patches/patch-ab b/wm/golem/patches/patch-ab index a22870e08b7..89d7b14b701 100644 --- a/wm/golem/patches/patch-ab +++ b/wm/golem/patches/patch-ab @@ -1,8 +1,31 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/05/15 11:19:43 salo Exp $ +$NetBSD: patch-ab,v 1.2 2003/05/18 21:09:08 abs Exp $ ---- src/rcfile.y.orig 2002-05-22 01:06:25.000000000 +0200 -+++ src/rcfile.y 2003-05-15 11:46:30.000000000 +0200 -@@ -536,7 +536,7 @@ +--- src/rcfile.y.orig Wed May 22 00:06:25 2002 ++++ src/rcfile.y +@@ -304,12 +304,16 @@ options_stmt : error + + keys_stmt : error + | KEYNAME STRING modmask keyarg { +- if (keys_add(XKeysymToKeycode(display, XStringToKeysym($2)), +- $3, $1, (void *) $4) == NULL) { +- free($2); +- yyerror("couldn't allocate memory for keybind_t"); +- YYERROR; +- } ++ int keycode; ++ keycode = XKeysymToKeycode(display, XStringToKeysym($2)); ++ if (keycode == 0 && strncmp($2, "KeyCode", 7) == 0) ++ keycode = atoi($2 + 7); ++ if (keycode > 0) ++ if (keys_add(keycode, $3, $1, (void *) $4) == NULL) { ++ free($2); ++ yyerror("couldn't allocate memory for keybind_t"); ++ YYERROR; ++ } + free($2); + } + ; +@@ -536,7 +540,7 @@ void rcfile_parse() { */ fp = fopen(rcfn, "r"); if (!fp) { |