[SM-Commit] GIT changes to master grimoire by George Sherwood (8645c53f33db85192b497f9645cc98fe8c7caf4d)

George Sherwood scm at sourcemage.org
Fri Aug 15 21:07:29 EDT 2008


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 devel/tcl/DETAILS           |    4 -
 devel/tcl/HISTORY           |    3 +
 devel/tk/DETAILS            |    7 +-
 devel/tk/HISTORY            |    5 +
 devel/tk/PRE_BUILD          |    3 -
 devel/tk/genericevent.patch |  115 --------------------------------------------
 6 files changed, 14 insertions(+), 123 deletions(-)

New commits:
commit 8645c53f33db85192b497f9645cc98fe8c7caf4d
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    tk: Updated to version 8.5.4. Removed genericevent.patch.
    Incorporated upstream.

commit ec2231b65038677e4d5df2d9c8b880633e153da9
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    tcl: Updated to version 8.5.4

diff --git a/devel/tcl/DETAILS b/devel/tcl/DETAILS
index 4dfa010..21f5897 100755
--- a/devel/tcl/DETAILS
+++ b/devel/tcl/DETAILS
@@ -4,9 +4,9 @@ if [ "$DEVEL" = "y" ]; then
           SOURCE=tcl$VERSION-src.tar.gz
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
 else
-         VERSION=8.5.3
+         VERSION=8.5.4
           SOURCE=tcl$VERSION-src.tar.gz
-     SOURCE_HASH=sha512:fea906475b0812bbb46507a72a3ce54449eae88883a8df0554e73cbffb73782582430101e1f099ea5266a0b8a36a1277ab5da3b8fd75cda2a967b9713c40cfbe
+     SOURCE_HASH=sha512:40ceec99d1aa76a5e7c87af6f3520ee5fba0b9ea0e879a29b0f83a914f2a88f81e3494c95f160342324df8dc59d906cc0f307f522b5fb1ec08349edbb609dcfd
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
 fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/tcl$VERSION
diff --git a/devel/tcl/HISTORY b/devel/tcl/HISTORY
index d0a304f..bbec690 100644
--- a/devel/tcl/HISTORY
+++ b/devel/tcl/HISTORY
@@ -1,3 +1,6 @@
+2008-08-15 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated stable to 8.5.4
+
 2008-07-07 Alexander Tsamutali <astsmtl at gmail.com>
 	* DETAILS: Updated stable to 8.5.3
 
diff --git a/devel/tk/DETAILS b/devel/tk/DETAILS
index 30fb06f..8762478 100755
--- a/devel/tk/DETAILS
+++ b/devel/tk/DETAILS
@@ -4,9 +4,9 @@ if [ "$DEVEL" = "y" ]; then
        SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
       SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig:WORKS_FOR_ME"
 else
-          VERSION=8.5.3
-      SOURCE_HASH=sha512:fea906475b0812bbb46507a72a3ce54449eae88883a8df0554e73cbffb73782582430101e1f099ea5266a0b8a36a1277ab5da3b8fd75cda2a967b9713c40cfbe
-     SOURCE2_HASH=sha512:f7ec5af2db2509374c94faf53dd975ba1e222e2f8bfa2e8af398261877564169e01cfee2dc2c5401586012b5fbd7e02558790c96ed9b194125cf7286c3679f3b
+          VERSION=8.5.4
+      SOURCE_HASH=sha512:40ceec99d1aa76a5e7c87af6f3520ee5fba0b9ea0e879a29b0f83a914f2a88f81e3494c95f160342324df8dc59d906cc0f307f522b5fb1ec08349edbb609dcfd
+     SOURCE2_HASH=sha512:badfcaa29bdcc4548b1c8e9797a7e664c1be5d8f100ed3ad3b9bc50fd689285ec4a46c487037991d107a122735729c453a6a9df1211d665f0968a8f68e8108ba
 fi
            SOURCE=tcl$VERSION-src.tar.gz
           SOURCE2=tk$VERSION-src.tar.gz
@@ -16,7 +16,6 @@ SOURCE2_DIRECTORY=$BUILD_DIRECTORY/tk$VERSION
    SOURCE2_URL[0]=$SOURCEFORGE_URL/tcl/$SOURCE2
          WEB_SITE=http://www.scriptics.com/
           ENTERED=20020507
-       PATCHLEVEL=1
        LICENSE[0]=UNKNOWN
        LICENSE[1]=UNKNOWN
              DOCS="ChangeLog README"
diff --git a/devel/tk/HISTORY b/devel/tk/HISTORY
index 155c6af..740353d 100644
--- a/devel/tk/HISTORY
+++ b/devel/tk/HISTORY
@@ -1,3 +1,8 @@
+2008-08-15 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated stable to 8.5.4
+	* PRE_BUILD: Removed patch.
+	* genericevent.patch: Removed patch. Incorporated upstream.
+
 2008-08-05 George Sherwood <gsherwood at sourcemage.org>
 	* PRE_BUILD: Removed initial and added improved upstream patch
 	* genericevent.patch: improved upstream patch for xproto issue
diff --git a/devel/tk/PRE_BUILD b/devel/tk/PRE_BUILD
index 0ac8c96..43d297e 100755
--- a/devel/tk/PRE_BUILD
+++ b/devel/tk/PRE_BUILD
@@ -2,5 +2,4 @@ mk_source_dir  $SOURCE_DIRECTORY                    &&
 mk_source_dir  $SOURCE2_DIRECTORY                   &&
 unpack_file                                         &&
 unpack_file 2 &&
-cd $SOURCE2_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/genericevent.patch
+cd $SOURCE2_DIRECTORY
diff --git a/devel/tk/genericevent.patch b/devel/tk/genericevent.patch
deleted file mode 100644
index eba226d..0000000
--- a/devel/tk/genericevent.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Index: generic/tk.h
-===================================================================
-RCS file: /cvsroot/tktoolkit/tk/generic/tk.h,v
-retrieving revision 1.112
-diff -u -r1.112 tk.h
---- generic/tk.h	19 Jun 2008 19:48:26 -0000	1.112
-+++ generic/tk.h	28 Jul 2008 12:38:26 -0000
-@@ -627,17 +627,18 @@
-  *---------------------------------------------------------------------------
-  */
- 
--#define VirtualEvent	    (LASTEvent)
--#define ActivateNotify	    (LASTEvent + 1)
--#define DeactivateNotify    (LASTEvent + 2)
--#define MouseWheelEvent     (LASTEvent + 3)
--#define TK_LASTEVENT	    (LASTEvent + 4)
-+#if (TK_MAJOR_VERSION > 8)
-+#error Maintenance todo: Fix GenericEvent/VirtualEvent clash. [Bug 2010422]
-+#endif
-+#define VirtualEvent	    (MappingNotify + 1)
-+#define ActivateNotify	    (MappingNotify + 2)
-+#define DeactivateNotify    (MappingNotify + 3)
-+#define MouseWheelEvent     (MappingNotify + 4)
-+#define TK_LASTEVENT	    (MappingNotify + 5)
- 
- #define MouseWheelMask	    (1L << 28)
--
- #define ActivateMask	    (1L << 29)
- #define VirtualEventMask    (1L << 30)
--#define TK_LASTEVENT	    (LASTEvent + 4)
- 
- /*
-  * A virtual event shares most of its fields with the XKeyEvent and
-Index: generic/tkEvent.c
-===================================================================
-RCS file: /cvsroot/tktoolkit/tk/generic/tkEvent.c,v
-retrieving revision 1.35
-diff -u -r1.35 tkEvent.c
---- generic/tkEvent.c	26 Mar 2008 19:04:09 -0000	1.35
-+++ generic/tkEvent.c	28 Jul 2008 12:38:27 -0000
-@@ -75,7 +75,7 @@
-  * Array of event masks corresponding to each X event:
-  */
- 
--static unsigned long eventMasks[TK_LASTEVENT] = {
-+static unsigned long realEventMasks[MappingNotify+1] = {
-     0,
-     0,
-     KeyPressMask,			/* KeyPress */
-@@ -113,7 +113,10 @@
-     0,					/* SelectionNotify */
-     ColormapChangeMask,			/* ColormapNotify */
-     0,					/* ClientMessage */
--    0,					/* Mapping Notify */
-+    0					/* Mapping Notify */
-+};
-+
-+static unsigned long virtualEventMasks[TK_LASTEVENT-VirtualEvent] = {
-     VirtualEventMask,			/* VirtualEvents */
-     ActivateMask,			/* ActivateNotify */
-     ActivateMask,			/* DeactivateNotify */
-@@ -489,7 +492,7 @@
-  *
-  * GetEventMaskFromXEvent --
-  *
-- *	The event type is looked up in our eventMasks table, and may be
-+ *	The event type is looked up in our eventMasks tables, and may be
-  *	changed to a different mask depending on the state of the event and
-  *	window members.
-  *
-@@ -506,7 +509,21 @@
- GetEventMaskFromXEvent(
-     XEvent *eventPtr)
- {
--    unsigned long mask = eventMasks[eventPtr->xany.type];
-+    unsigned long mask;
-+
-+    /*
-+     * Get the event mask from the correct table. Note that there are two
-+     * tables here because that means we no longer need this code to rely on
-+     * the exact value of VirtualEvent, which has caused us problems in the
-+     * past when X11 changed the value of LASTEvent. [Bug ???]
-+     */
-+
-+    if (eventPtr->xany.type <= MappingNotify) {
-+	mask = realEventMasks[eventPtr->xany.type];
-+    } else if (eventPtr->xany.type >= VirtualEvent
-+	    && eventPtr->xany.type<TK_LASTEVENT) {
-+	mask = virtualEventMasks[eventPtr->xany.type - VirtualEvent];
-+    }
- 
-     /*
-      * Events selected by StructureNotify require special handling. They look
-Index: unix/tkUnixEvent.c
-===================================================================
-RCS file: /cvsroot/tktoolkit/tk/unix/tkUnixEvent.c,v
-retrieving revision 1.28
-diff -u -r1.28 tkUnixEvent.c
---- unix/tkUnixEvent.c	27 Apr 2008 22:39:13 -0000	1.28
-+++ unix/tkUnixEvent.c	28 Jul 2008 12:38:28 -0000
-@@ -289,6 +289,14 @@
- 
-     while (QLength(display) > 0) {
- 	XNextEvent(display, &event);
-+#ifdef GenericEvent
-+	if (event.type == GenericEvent) {
-+	    xGenericEvent *xgePtr = (xGenericEvent *) &event;
-+
-+	    Tcl_Panic("Wild GenericEvent; panic! (extension=%d,evtype=%d)",
-+		    xgePtr->extension, xgePtr->evtype);
-+	}
-+#endif
- 	if (event.type != KeyPress && event.type != KeyRelease) {
- 	    if (XFilterEvent(&event, None)) {
- 		continue;



More information about the SM-Commit mailing list