diff options
| author | sborrill <sborrill> | 2009-05-15 12:12:28 +0000 |
|---|---|---|
| committer | sborrill <sborrill> | 2009-05-15 12:12:28 +0000 |
| commit | 2dbd8415eb756ab8109551f33dbe736d70ffdc22 (patch) | |
| tree | 96ddc77ae81613391c5fa212e4022f73f1076770 | |
| parent | 43eb65e79c7971c19adecc21552dd33f85e1498a (diff) | |
| download | pkgsrc-2dbd8415eb756ab8109551f33dbe736d70ffdc22.tar.gz | |
Pull in patch from tk 8.4 to work with xproto > 7.0.13 (fixes MouseWheel
problems at tk startup).
Bump PKGREVISION
| -rw-r--r-- | x11/tk83/Makefile | 4 | ||||
| -rw-r--r-- | x11/tk83/distinfo | 3 | ||||
| -rw-r--r-- | x11/tk83/patches/patch-af | 23 |
3 files changed, 27 insertions, 3 deletions
diff --git a/x11/tk83/Makefile b/x11/tk83/Makefile index 537cf250d28..5d1763cffc9 100644 --- a/x11/tk83/Makefile +++ b/x11/tk83/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2007/12/02 11:50:24 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2009/05/15 12:12:28 sborrill Exp $ DISTNAME= tk8.3.4 PKGNAME= tk-8.3.4 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 MASTER_SITES= ftp://ftp.informatik.uni-hamburg.de/pub/soft/lang/tcl/tcl8_3/ diff --git a/x11/tk83/distinfo b/x11/tk83/distinfo index d294def8252..bb5a0a3ef6d 100644 --- a/x11/tk83/distinfo +++ b/x11/tk83/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2008/07/14 00:43:34 dholland Exp $ +$NetBSD: distinfo,v 1.9 2009/05/15 12:12:28 sborrill Exp $ SHA1 (tk8.3.4.tar.gz) = d52bf5cedb73e9b817ba8d6a2b00701f4f82fad2 RMD160 (tk8.3.4.tar.gz) = f154fd9b2eedcff732b9cdabee48bd9af1b3dd26 @@ -8,3 +8,4 @@ SHA1 (patch-ab) = 2476494048a118c06af497428d39aaab05faec4c SHA1 (patch-ac) = b7e3a2fefafd00d3d00499117fe7dc42fb6ad429 SHA1 (patch-ad) = 7aaab1728ad13ddbbf4483780f818996a09a67f9 SHA1 (patch-ae) = 9ab780fbfcc18606423abf4a1ae8816a39856dbf +SHA1 (patch-af) = bfbb2a9ebdaf172b242b33668d4af64c316a8b63 diff --git a/x11/tk83/patches/patch-af b/x11/tk83/patches/patch-af new file mode 100644 index 00000000000..32764013828 --- /dev/null +++ b/x11/tk83/patches/patch-af @@ -0,0 +1,23 @@ +$NetBSD: patch-af,v 1.1 2009/05/15 12:12:28 sborrill Exp $ + +Tk uses X event numbers to index this array, as well as adding a few of its +own, starting with "VirtualEvent" (Which is correctly set to LASTEvent, +defined in include/X11/X.h). In xproto-7.0.13, a new event "GenericEvent" was +added - making the array broken for all of Tk's internal events. + +A cleaner fix, but a much bigger patch, is listed in the Tk bug tracker: + +http://sourceforge.net/tracker/index.php?func=detail&aid=2010422&group_id=12997&atid=112997 + +--- generic/tkBind.c.orig 2009-05-15 14:14:34.000000000 +0100 ++++ generic/tkBind.c 2009-05-15 14:16:15.000000000 +0100 +@@ -575,6 +575,9 @@ + /* ColormapNotify */ COLORMAP, + /* ClientMessage */ 0, + /* MappingNotify */ 0, ++#ifdef GenericEvent ++ /* GenericEvent */ 0, /* Introduced in xproto-7.0.13 */ ++#endif + /* VirtualEvent */ VIRTUAL, + /* Activate */ ACTIVATE, + /* Deactivate */ ACTIVATE, |