[SM-Commit] GIT changes to master grimoire by George Sherwood (2b115683d9b253d00b7751eb1e44cedc100ccee7)

George Sherwood scm at sourcemage.org
Tue Jul 22 14:32:45 EDT 2008


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

 devel/tk/DETAILS            |    1 +
 devel/tk/HISTORY            |    6 ++++++
 devel/tk/PRE_BUILD          |    4 +++-
 devel/tk/tk-lastevent.patch |   29 +++++++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 1 deletion(-)

New commits:
commit 2b115683d9b253d00b7751eb1e44cedc100ccee7
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    tk: Added upstream patch to fix problem with xproto 7.0.13.
    PATCHLEVEL++

diff --git a/devel/tk/DETAILS b/devel/tk/DETAILS
index bc4342f..30fb06f 100755
--- a/devel/tk/DETAILS
+++ b/devel/tk/DETAILS
@@ -16,6 +16,7 @@ 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 cb6af48..521b586 100644
--- a/devel/tk/HISTORY
+++ b/devel/tk/HISTORY
@@ -1,3 +1,9 @@
+2008-07-22 George Sherwood <george at beernabeer.com>
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD: Added upstream patch
+	* tk-lastevent.patch: added to fix but with xproto > 7.0.13 from
+	  http://sourceforge.net/tracker/index.php?func=detail&aid=2010422&group_id=12997&atid=112997
+
 2008-07-07 Alexander Tsamutali <astsmtl at gmail.com>
 	* DETAILS: Updated stable to 8.5.3
 
diff --git a/devel/tk/PRE_BUILD b/devel/tk/PRE_BUILD
index 3f13866..12f5888 100755
--- a/devel/tk/PRE_BUILD
+++ b/devel/tk/PRE_BUILD
@@ -1,4 +1,6 @@
 mk_source_dir  $SOURCE_DIRECTORY                    &&
 mk_source_dir  $SOURCE2_DIRECTORY                   &&
 unpack_file                                         &&
-unpack_file 2
+unpack_file 2 &&
+cd $SOURCE2_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/tk-lastevent.patch
diff --git a/devel/tk/tk-lastevent.patch b/devel/tk/tk-lastevent.patch
new file mode 100644
index 0000000..7cb3fcc
--- /dev/null
+++ b/devel/tk/tk-lastevent.patch
@@ -0,0 +1,29 @@
+Date: Sat Jul 12 09:40:30 PDT 2008
+Files: generic/tk.h
+Bugid: 2010422
+
+--- generic/tk.h.lastevent.old	2008-07-01 09:59:58.000000000 -0700
++++ generic/tk.h	2008-07-12 09:40:02.933155263 -0700
+@@ -627,17 +627,15 @@
+  *---------------------------------------------------------------------------
+  */
+ 
+-#define VirtualEvent	    (LASTEvent)
+-#define ActivateNotify	    (LASTEvent + 1)
+-#define DeactivateNotify    (LASTEvent + 2)
+-#define MouseWheelEvent     (LASTEvent + 3)
+-#define TK_LASTEVENT	    (LASTEvent + 4)
++#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



More information about the SM-Commit mailing list