diff options
| author | tron <tron@pkgsrc.org> | 2008-09-10 10:47:31 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2008-09-10 10:47:31 +0000 |
| commit | fb2310ca315305a330d3a11cedbb3736b75330e4 (patch) | |
| tree | f933c40e60c80fa1fb009086c3fb151e8a9fe7e8 | |
| parent | 9d172cd81bef4f0064a57ea7691921a718861220 (diff) | |
| download | pkgsrc-fb2310ca315305a330d3a11cedbb3736b75330e4.tar.gz | |
Pullup - ticket #2523 - requested by is
tk: make this package work with modular X.org
Revisions pulled up:
x11/tk/Makefile 1.62
x11/tk/distinfo 1.34
x11/tk/patches/patch-ae 1.4
---
Module Name: pkgsrc
Committed By: dsainty
Date: Wed Aug 6 04:09:12 UTC 2008
Modified Files:
pkgsrc/x11/tk: Makefile distinfo
Added Files:
pkgsrc/x11/tk/patches: patch-ae
Log Message:
Tk uses X event numbers to index an "event" 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 defined array broken for all of Tk's internal events.
The easy fix is to just add in the missing event into the hard-coded array.
This patch was reported here: http://bugs.gentoo.org/show_bug.cgi?id=225999
A cleaner fix, but a much bigger patch, is listed in the Tk bug tracker. I'm
punting that Tk will have been updated with the fix before X.h grows another
event.
http://sourceforge.net/tracker/index.php?func=detail&aid=2010422&group_id=12997&atid=112997
Bump PKGREVISION.
| -rw-r--r-- | x11/tk/Makefile | 3 | ||||
| -rw-r--r-- | x11/tk/distinfo | 3 | ||||
| -rw-r--r-- | x11/tk/patches/patch-ae | 23 |
3 files changed, 27 insertions, 2 deletions
diff --git a/x11/tk/Makefile b/x11/tk/Makefile index ebe3b982f88..5f4263095a7 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.61 2007/09/25 10:03:54 hira Exp $ +# $NetBSD: Makefile,v 1.61.10.1 2008/09/10 10:47:31 tron Exp $ DISTNAME= tk${TK_VERSION}-src PKGNAME= tk-${TK_VERSION} +PKGREVISION= 1 CATEGORIES= x11 lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} diff --git a/x11/tk/distinfo b/x11/tk/distinfo index 8fc5ce2fb25..09029420a4d 100644 --- a/x11/tk/distinfo +++ b/x11/tk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2008/04/07 15:14:10 bjs Exp $ +$NetBSD: distinfo,v 1.32.4.1 2008/09/10 10:47:31 tron Exp $ SHA1 (tk8.4.18-src.tar.gz) = c1032f3cacd40406065fc1f46ecd217f50329273 RMD160 (tk8.4.18-src.tar.gz) = 9c01ba85575a230231793a9885457c98046e41bb @@ -7,3 +7,4 @@ SHA1 (patch-aa) = b729957a24ce2fb6f972bbb19af27bd7d41f1846 SHA1 (patch-ab) = 09c385b45dc7c6845086ece752b9cfdee7611e06 SHA1 (patch-ac) = 17a266317ca7c7951794efaf5aafc60dc54ffd6e SHA1 (patch-ad) = 14ad16e840a825e987721f23c6308c4a011dbe01 +SHA1 (patch-ae) = 7901a53b8f2742898f837d4587be03ef66912af4 diff --git a/x11/tk/patches/patch-ae b/x11/tk/patches/patch-ae new file mode 100644 index 00000000000..1d6dbb64eff --- /dev/null +++ b/x11/tk/patches/patch-ae @@ -0,0 +1,23 @@ +$NetBSD: patch-ae,v 1.3.18.1 2008/09/10 10:47:31 tron 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 2008-08-06 15:19:07.000000000 +1200 ++++ generic/tkBind.c 2008-08-06 15:21:30.000000000 +1200 +@@ -586,6 +586,9 @@ + /* ColormapNotify */ COLORMAP, + /* ClientMessage */ 0, + /* MappingNotify */ 0, ++#ifdef GenericEvent ++ /* GenericEvent */ 0, /* Introduced in xproto-7.0.13 */ ++#endif + /* VirtualEvent */ VIRTUAL, + /* Activate */ ACTIVATE, + /* Deactivate */ ACTIVATE, |