summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorgson <gson>2009-08-17 14:40:43 +0000
committergson <gson>2009-08-17 14:40:43 +0000
commitc02538240271f38ae3e163a8bf6868b35f96c25c (patch)
tree1dcc578795e953fba90be8ae7f7d6f3433ef99cd /x11
parent6ac9505a4e579f688e65815ffc38694946897d06 (diff)
downloadpkgsrc-c02538240271f38ae3e163a8bf6868b35f96c25c.tar.gz
Deal with the new "GenericEvent" X event. This fixes the same bug in
x11/p5-Tk that tk-8.4.18nb1 fixed in x11/tk.
Diffstat (limited to 'x11')
-rw-r--r--x11/p5-Tk/Makefile3
-rw-r--r--x11/p5-Tk/distinfo3
-rw-r--r--x11/p5-Tk/patches/patch-ai24
3 files changed, 28 insertions, 2 deletions
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index 36a96e101ba..210780ac877 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2008/10/22 10:35:30 markd Exp $
+# $NetBSD: Makefile,v 1.61 2009/08/17 14:40:43 gson Exp $
DISTNAME= Tk-804.028
+PKGREVISION= 1
PKGNAME= p5-Tk-804.028
SVR4_PKGNAME= p5tk
CATEGORIES= x11 tk perl5
diff --git a/x11/p5-Tk/distinfo b/x11/p5-Tk/distinfo
index fe2fac4ef3e..88b1bf65bb1 100644
--- a/x11/p5-Tk/distinfo
+++ b/x11/p5-Tk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2009/03/20 17:32:06 hasso Exp $
+$NetBSD: distinfo,v 1.16 2009/08/17 14:40:43 gson Exp $
SHA1 (Tk-804.028.tar.gz) = 075c751f1388741aa313e002578d2e802668f2e8
RMD160 (Tk-804.028.tar.gz) = 8db5d3376f2374429ef71c38ddd268a73bac437e
@@ -11,3 +11,4 @@ SHA1 (patch-ae) = 865e5d868bac794c6058f5b7465239a4ca968877
SHA1 (patch-af) = 7d8de5532dd67680d6d3ad08f01fcb066805b45c
SHA1 (patch-ag) = ac4dccefd04743db78ddecde51b23194da1a801f
SHA1 (patch-ah) = 9399bfd03b6cc215cc8f918ac8ae0348bf7f6272
+SHA1 (patch-ai) = 37f3651c6491c5d2e3bec1e9649e7e05f45275a9
diff --git a/x11/p5-Tk/patches/patch-ai b/x11/p5-Tk/patches/patch-ai
new file mode 100644
index 00000000000..fedc16818d8
--- /dev/null
+++ b/x11/p5-Tk/patches/patch-ai
@@ -0,0 +1,24 @@
+$NetBSD: patch-ai,v 1.1 2009/08/17 14:40:43 gson Exp $
+
+--- pTk/mTk/generic/tkBind.c.orig 2009-08-17 12:41:17.000000000 +0300
++++ pTk/mTk/generic/tkBind.c
+@@ -585,6 +585,9 @@ char *eventTypeName[TK_LASTEVENT] = {
+ "ColormapNotify",
+ "ClientMessage",
+ "MappingNotify",
++#ifdef GenericEvent
++ "GenericEvent", /* Introduced in xproto-7.0.13 */
++#endif
+ "VirtualEvent",
+ "Activate",
+ "Deactivate"
+@@ -629,6 +632,9 @@ static int flagArray[TK_LASTEVENT] = {
+ /* ColormapNotify */ COLORMAP,
+ /* ClientMessage */ 0,
+ /* MappingNotify */ 0,
++#ifdef GenericEvent
++ /* GenericEvent */ 0, /* Introduced in xproto-7.0.13 */
++#endif
+ /* VirtualEvent */ VIRTUAL,
+ /* Activate */ ACTIVATE,
+ /* Deactivate */ ACTIVATE,