summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjoerg <joerg>2007-09-21 19:39:11 +0000
committerjoerg <joerg>2007-09-21 19:39:11 +0000
commit58f5f23f3fc2d27f0cd65c0f8790876a536a71e4 (patch)
treec8d8ad7e6ad06f031b6fc50cb84a0db3117602c8 /x11
parentc2c11d7032f061053ea4579a02a55a29087b476b (diff)
downloadpkgsrc-58f5f23f3fc2d27f0cd65c0f8790876a536a71e4.tar.gz
Fix locking bug in upstream code. Ride on the initial update.
Diffstat (limited to 'x11')
-rw-r--r--x11/libXi/distinfo3
-rw-r--r--x11/libXi/patches/patch-aa16
2 files changed, 18 insertions, 1 deletions
diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo
index b7b88d5fcac..8fb0df08103 100644
--- a/x11/libXi/distinfo
+++ b/x11/libXi/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2007/09/21 19:28:47 bjs Exp $
+$NetBSD: distinfo,v 1.6 2007/09/21 19:39:11 joerg Exp $
SHA1 (libXi-1.1.3.tar.bz2) = 60608bcbebadc5fe0b51b5012e9301eb720988fe
RMD160 (libXi-1.1.3.tar.bz2) = e6446f28a903eed54eccc5d4df685f9623942a0b
Size (libXi-1.1.3.tar.bz2) = 248007 bytes
+SHA1 (patch-aa) = f4709b631db41d00302d520b3507dd74e7fe1b4a
diff --git a/x11/libXi/patches/patch-aa b/x11/libXi/patches/patch-aa
new file mode 100644
index 00000000000..095cd64c270
--- /dev/null
+++ b/x11/libXi/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1 2007/09/21 19:39:11 joerg Exp $
+
+--- src/XStFocus.c.orig 2007-09-21 21:35:50.000000000 +0200
++++ src/XStFocus.c
+@@ -72,8 +72,10 @@ XSetDeviceFocus(dpy, dev, focus, revert_
+ XExtDisplayInfo *info = XInput_find_display(dpy);
+
+ LockDisplay(dpy);
+- if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
++ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1) {
++ UnlockDisplay(dpy);
+ return (NoSuchExtension);
++ }
+
+ GetReq(SetDeviceFocus, req);
+ req->reqType = info->codes->major_opcode;