Mon Aug 17 14:40:43 2009 UTC ()
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.


(gson)
diff -r1.60 -r1.61 pkgsrc/x11/p5-Tk/Makefile
diff -r1.15 -r1.16 pkgsrc/x11/p5-Tk/distinfo
diff -r0 -r1.1 pkgsrc/x11/p5-Tk/patches/patch-ai
cvs diff -r1.60 -r1.61 pkgsrc/x11/p5-Tk/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/p5-Tk/Makefile 2008/10/22 10:35:30 1.60
+++ pkgsrc/x11/p5-Tk/Makefile 2009/08/17 14:40:43 1.61
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.60 2008/10/22 10:35:30 markd Exp $ 1# $NetBSD: Makefile,v 1.61 2009/08/17 14:40:43 gson Exp $
2 2
3DISTNAME= Tk-804.028 3DISTNAME= Tk-804.028
 4PKGREVISION= 1
4PKGNAME= p5-Tk-804.028 5PKGNAME= p5-Tk-804.028
5SVR4_PKGNAME= p5tk 6SVR4_PKGNAME= p5tk
6CATEGORIES= x11 tk perl5 7CATEGORIES= x11 tk perl5
7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Tk/} 8MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Tk/}
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://cpan.uwinnipeg.ca/htdocs/Tk/Tk.html 11HOMEPAGE= http://cpan.uwinnipeg.ca/htdocs/Tk/Tk.html
11COMMENT= Perl5 interface to Tk 12COMMENT= Perl5 interface to Tk
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
15 16
16MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
cvs diff -r1.15 -r1.16 pkgsrc/x11/p5-Tk/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/p5-Tk/distinfo 2009/03/20 17:32:06 1.15
+++ pkgsrc/x11/p5-Tk/distinfo 2009/08/17 14:40:43 1.16
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.15 2009/03/20 17:32:06 hasso Exp $ 1$NetBSD: distinfo,v 1.16 2009/08/17 14:40:43 gson Exp $
2 2
3SHA1 (Tk-804.028.tar.gz) = 075c751f1388741aa313e002578d2e802668f2e8 3SHA1 (Tk-804.028.tar.gz) = 075c751f1388741aa313e002578d2e802668f2e8
4RMD160 (Tk-804.028.tar.gz) = 8db5d3376f2374429ef71c38ddd268a73bac437e 4RMD160 (Tk-804.028.tar.gz) = 8db5d3376f2374429ef71c38ddd268a73bac437e
5Size (Tk-804.028.tar.gz) = 6927637 bytes 5Size (Tk-804.028.tar.gz) = 6927637 bytes
6SHA1 (patch-aa) = 59e0455edef3ea4cb3d2c3122971344ccceefdcb 6SHA1 (patch-aa) = 59e0455edef3ea4cb3d2c3122971344ccceefdcb
7SHA1 (patch-ab) = 67a2f18ceb289e3503ecb66a35b47915736cc52a 7SHA1 (patch-ab) = 67a2f18ceb289e3503ecb66a35b47915736cc52a
8SHA1 (patch-ac) = 95bcdd8906905c184511b9d68c6874564c437707 8SHA1 (patch-ac) = 95bcdd8906905c184511b9d68c6874564c437707
9SHA1 (patch-ad) = 63ebc6b66557e7ea36c9e3ee51366a0de43da699 9SHA1 (patch-ad) = 63ebc6b66557e7ea36c9e3ee51366a0de43da699
10SHA1 (patch-ae) = 865e5d868bac794c6058f5b7465239a4ca968877 10SHA1 (patch-ae) = 865e5d868bac794c6058f5b7465239a4ca968877
11SHA1 (patch-af) = 7d8de5532dd67680d6d3ad08f01fcb066805b45c 11SHA1 (patch-af) = 7d8de5532dd67680d6d3ad08f01fcb066805b45c
12SHA1 (patch-ag) = ac4dccefd04743db78ddecde51b23194da1a801f 12SHA1 (patch-ag) = ac4dccefd04743db78ddecde51b23194da1a801f
13SHA1 (patch-ah) = 9399bfd03b6cc215cc8f918ac8ae0348bf7f6272 13SHA1 (patch-ah) = 9399bfd03b6cc215cc8f918ac8ae0348bf7f6272
 14SHA1 (patch-ai) = 37f3651c6491c5d2e3bec1e9649e7e05f45275a9
File Added: pkgsrc/x11/p5-Tk/patches/patch-ai
$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,