Wed Sep 10 10:47:31 2008 UTC ()
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.
(tron)
diff -r1.61 -r1.61.10.1 pkgsrc/x11/tk/Makefile
diff -r1.32 -r1.32.4.1 pkgsrc/x11/tk/distinfo
diff -r0 -r1.3.18.1 pkgsrc/x11/tk/patches/patch-ae
--- pkgsrc/x11/tk/Makefile 2007/09/25 10:03:54 1.61
+++ pkgsrc/x11/tk/Makefile 2008/09/10 10:47:31 1.61.10.1
| @@ -1,17 +1,18 @@ | | | @@ -1,17 +1,18 @@ |
| 1 | # $NetBSD: Makefile,v 1.61 2007/09/25 10:03:54 hira Exp $ | | 1 | # $NetBSD: Makefile,v 1.61.10.1 2008/09/10 10:47:31 tron Exp $ |
| 2 | | | 2 | |
| 3 | DISTNAME= tk${TK_VERSION}-src | | 3 | DISTNAME= tk${TK_VERSION}-src |
| 4 | PKGNAME= tk-${TK_VERSION} | | 4 | PKGNAME= tk-${TK_VERSION} |
| | | 5 | PKGREVISION= 1 |
| 5 | CATEGORIES= x11 lang | | 6 | CATEGORIES= x11 lang |
| 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} | | 7 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} |
| 7 | | | 8 | |
| 8 | MAINTAINER= jwise@NetBSD.org | | 9 | MAINTAINER= jwise@NetBSD.org |
| 9 | HOMEPAGE= http://www.tcl.tk/ | | 10 | HOMEPAGE= http://www.tcl.tk/ |
| 10 | COMMENT= Graphical toolkit for TCL | | 11 | COMMENT= Graphical toolkit for TCL |
| 11 | | | 12 | |
| 12 | .include "../../x11/tk/Makefile.version" | | 13 | .include "../../x11/tk/Makefile.version" |
| 13 | | | 14 | |
| 14 | PKG_DESTDIR_SUPPORT= user-destdir | | 15 | PKG_DESTDIR_SUPPORT= user-destdir |
| 15 | PKG_INSTALLATION_TYPES= overwrite pkgviews | | 16 | PKG_INSTALLATION_TYPES= overwrite pkgviews |
| 16 | | | 17 | |
| 17 | WRKSRC= ${WRKDIR}/tk${TK_VERSION} | | 18 | WRKSRC= ${WRKDIR}/tk${TK_VERSION} |
--- pkgsrc/x11/tk/distinfo 2008/04/07 15:14:10 1.32
+++ pkgsrc/x11/tk/distinfo 2008/09/10 10:47:31 1.32.4.1
| @@ -1,9 +1,10 @@ | | | @@ -1,9 +1,10 @@ |
| 1 | $NetBSD: distinfo,v 1.32 2008/04/07 15:14:10 bjs Exp $ | | 1 | $NetBSD: distinfo,v 1.32.4.1 2008/09/10 10:47:31 tron Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (tk8.4.18-src.tar.gz) = c1032f3cacd40406065fc1f46ecd217f50329273 | | 3 | SHA1 (tk8.4.18-src.tar.gz) = c1032f3cacd40406065fc1f46ecd217f50329273 |
| 4 | RMD160 (tk8.4.18-src.tar.gz) = 9c01ba85575a230231793a9885457c98046e41bb | | 4 | RMD160 (tk8.4.18-src.tar.gz) = 9c01ba85575a230231793a9885457c98046e41bb |
| 5 | Size (tk8.4.18-src.tar.gz) = 3363853 bytes | | 5 | Size (tk8.4.18-src.tar.gz) = 3363853 bytes |
| 6 | SHA1 (patch-aa) = b729957a24ce2fb6f972bbb19af27bd7d41f1846 | | 6 | SHA1 (patch-aa) = b729957a24ce2fb6f972bbb19af27bd7d41f1846 |
| 7 | SHA1 (patch-ab) = 09c385b45dc7c6845086ece752b9cfdee7611e06 | | 7 | SHA1 (patch-ab) = 09c385b45dc7c6845086ece752b9cfdee7611e06 |
| 8 | SHA1 (patch-ac) = 17a266317ca7c7951794efaf5aafc60dc54ffd6e | | 8 | SHA1 (patch-ac) = 17a266317ca7c7951794efaf5aafc60dc54ffd6e |
| 9 | SHA1 (patch-ad) = 14ad16e840a825e987721f23c6308c4a011dbe01 | | 9 | SHA1 (patch-ad) = 14ad16e840a825e987721f23c6308c4a011dbe01 |
| | | 10 | SHA1 (patch-ae) = 7901a53b8f2742898f837d4587be03ef66912af4 |
$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,