diff options
| author | hubertf <hubertf@pkgsrc.org> | 2002-09-25 10:23:44 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2002-09-25 10:23:44 +0000 |
| commit | 9794a53e8722589c61e792e39fcaa7f886ea9cdd (patch) | |
| tree | 084632c946f4ec4da3a6b8b397b941c96bb659be | |
| parent | 882923ef375a15840c36586aac6fa0ccd9d6a976 (diff) | |
| download | pkgsrc-9794a53e8722589c61e792e39fcaa7f886ea9cdd.tar.gz | |
Fix PR 18412: x11/xkbset dumps core if the XKB extension is not loaded
| -rw-r--r-- | x11/xkbset/Makefile | 3 | ||||
| -rw-r--r-- | x11/xkbset/distinfo | 3 | ||||
| -rw-r--r-- | x11/xkbset/patches/patch-ab | 15 |
3 files changed, 19 insertions, 2 deletions
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile index 33a442f5a87..f4855f06390 100644 --- a/x11/xkbset/Makefile +++ b/x11/xkbset/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/09/23 15:39:46 hubertf Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/25 10:23:44 hubertf Exp $ # DISTNAME= xkbset-0.3 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://www.math.missouri.edu/~stephen/software/xkbset/ diff --git a/x11/xkbset/distinfo b/x11/xkbset/distinfo index 3556945e276..84cf6a2ea1b 100644 --- a/x11/xkbset/distinfo +++ b/x11/xkbset/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2002/09/25 08:44:30 hubertf Exp $ +$NetBSD: distinfo,v 1.3 2002/09/25 10:23:44 hubertf Exp $ SHA1 (xkbset-0.3.tar.gz) = 23133cc74b09182c1ce8efc2dc2ff1a78feb34b6 Size (xkbset-0.3.tar.gz) = 13279 bytes SHA1 (patch-aa) = 53ac36e771d976e0785a4ee68b734e216290fcd7 +SHA1 (patch-ab) = b74e6eb1cbca4a3d9d20ebee7af874d5f4a4b7dd diff --git a/x11/xkbset/patches/patch-ab b/x11/xkbset/patches/patch-ab new file mode 100644 index 00000000000..6f93803331a --- /dev/null +++ b/x11/xkbset/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.1 2002/09/25 10:23:45 hubertf Exp $ + +--- main.c.orig Thu Aug 17 06:36:15 2000 ++++ main.c +@@ -91,6 +91,10 @@ + } + + xkb = XkbGetKeyboard(display,XkbControlsMask,XkbUseCoreKbd); ++ if (xkb == 0) { ++ fprintf(stderr, "XKB not supported for display %s\n", getenv("DISPLAY")); ++ exit(1); ++ } + XkbGetControls(display, XkbAccessXTimeoutMask|XkbAllControlsMask, xkb); + + if (query) { |