summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authortnn <tnn>2007-10-13 11:44:39 +0000
committertnn <tnn>2007-10-13 11:44:39 +0000
commit865d81339153b9449cba0adc1a4259d587568e69 (patch)
tree6cccaeabcde44b0a39b791028ab647a9b13fe5ad /net
parent56df80cb7944f223d10d0fe66aa62421d990fe9c (diff)
downloadpkgsrc-865d81339153b9449cba0adc1a4259d587568e69.tar.gz
Ungrab the pointer on disconnect to avoid ending up with a dead pointer on
some X servers. Bump PKGREVISION.
Diffstat (limited to 'net')
-rw-r--r--net/x2vnc/Makefile4
-rw-r--r--net/x2vnc/distinfo3
-rw-r--r--net/x2vnc/patches/patch-ab27
3 files changed, 31 insertions, 3 deletions
diff --git a/net/x2vnc/Makefile b/net/x2vnc/Makefile
index c2039a64628..582fd7f48d2 100644
--- a/net/x2vnc/Makefile
+++ b/net/x2vnc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2007/01/17 12:12:15 abs Exp $
+# $NetBSD: Makefile,v 1.17 2007/10/13 11:44:39 tnn Exp $
#
DISTNAME= x2vnc-1.7.2
+PKGREVISION= 1
CATEGORIES= net x11
MASTER_SITES= http://fredrik.hubbe.net/x2vnc/
@@ -22,4 +23,3 @@ LDFLAGS.SunOS+= -lresolv
.include "../../x11/xf86dgaproto/buildlink3.mk"
.include "../../x11/xineramaproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
-
diff --git a/net/x2vnc/distinfo b/net/x2vnc/distinfo
index 712d7595200..4b97a5e1490 100644
--- a/net/x2vnc/distinfo
+++ b/net/x2vnc/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2007/01/16 13:22:25 abs Exp $
+$NetBSD: distinfo,v 1.7 2007/10/13 11:44:39 tnn Exp $
SHA1 (x2vnc-1.7.2.tar.gz) = aa1ed718e04e6beb3e7db94325198fdf330d8d1e
RMD160 (x2vnc-1.7.2.tar.gz) = a656365f2b09dd328594d092c1269fcc5c4841c6
Size (x2vnc-1.7.2.tar.gz) = 82258 bytes
SHA1 (patch-aa) = 828098e52990d897c49301bf73dbc83258c905da
+SHA1 (patch-ab) = 26895a39de0110c7af8b7843f275790691561168
diff --git a/net/x2vnc/patches/patch-ab b/net/x2vnc/patches/patch-ab
new file mode 100644
index 00000000000..898e48ddf52
--- /dev/null
+++ b/net/x2vnc/patches/patch-ab
@@ -0,0 +1,27 @@
+$NetBSD: patch-ab,v 1.1 2007/10/13 11:44:39 tnn Exp $
+
+--- x.c.orig 2006-06-14 05:34:41.000000000 +0200
++++ x.c
+@@ -173,6 +173,14 @@ int warn_about_hotkey(Display *dpy, XErr
+ */
+ static Bool mouseOnScreen;
+
++static void atexit_ungrab(void) {
++ if (grabbed) {
++ fprintf(stderr, "%s: exit while grabbed, ungrabbing input devices\n",
++ programName);
++ ungrabit(-1, -1, DefaultRootWindow(dpy));
++ }
++}
++
+ /*
+ * CreateXWindow.
+ */
+@@ -534,6 +542,7 @@ Bool CreateXWindow(void)
+ dumpcoord(&origo2);
+ fprintf(stderr,"offset=%d, %d\n",x_offset,y_offset);
+ */
++ atexit(atexit_ungrab);
+
+ return True;
+ }