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

George Sherwood scm at sourcemage.org
Sun Dec 14 12:26:48 EST 2008


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

 devel/tk/HISTORY      |    4 ++++
 devel/tk/PRE_BUILD    |    6 +++++-
 devel/tk/tk-fix.patch |   12 ++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

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

    tk: Added patch to fix Bug 14958

diff --git a/devel/tk/HISTORY b/devel/tk/HISTORY
index e3407e8..9713053 100644
--- a/devel/tk/HISTORY
+++ b/devel/tk/HISTORY
@@ -1,3 +1,7 @@
+2008-12-14 George Sherwood <gsherwood at sourcemage.org>
+	* PRE_BUILD: Added patch for devel version from Bug #14958
+	* tk-fix.patch: Added patch to fix build problem.
+
 2008-10-15 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated stable to 8.5.5. Updated devel to 8.6a3
 	* PREPARE: Updated devel query
diff --git a/devel/tk/PRE_BUILD b/devel/tk/PRE_BUILD
index 43d297e..b0bf14d 100755
--- a/devel/tk/PRE_BUILD
+++ b/devel/tk/PRE_BUILD
@@ -2,4 +2,8 @@ mk_source_dir  $SOURCE_DIRECTORY                    &&
 mk_source_dir  $SOURCE2_DIRECTORY                   &&
 unpack_file                                         &&
 unpack_file 2 &&
-cd $SOURCE2_DIRECTORY
+cd $SOURCE2_DIRECTORY &&
+
+if [[ "$DEVEL" == "y" ]]; then
+   patch -p0 < $SCRIPT_DIRECTORY/tk-fix.patch
+fi
diff --git a/devel/tk/tk-fix.patch b/devel/tk/tk-fix.patch
new file mode 100644
index 0000000..5ae5907
--- /dev/null
+++ b/devel/tk/tk-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur unix/tkUnixEvent.c unix/tkUnixEvent.c
+--- unix/tkUnixEvent.c	2008-10-05 20:22:21.000000000 +0200
++++ unix/tkUnixEvent.c	2008-12-13 11:43:45.000000000 +0100
+@@ -292,7 +292,7 @@
+ 	    xGenericEvent *xgePtr = (xGenericEvent *) &event;
+ 
+ 	    Tcl_Panic("Wild GenericEvent; panic! (extension=%d,evtype=%d)"
+-		    xgePtr->extension, xgePtr->evtype);
++		    ,xgePtr->extension, xgePtr->evtype);
+ 	}
+ #endif
+ 	if (event.type != KeyPress && event.type != KeyRelease) {



More information about the SM-Commit mailing list