summaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2002-01-26 06:58:01 +0000
committerbmah <bmah@FreeBSD.org>2002-01-26 06:58:01 +0000
commitcb34fc26289e627ae6aad72a11052f13e4e9cd31 (patch)
tree59477cebba804e67c4e61a42aba8b0fae0a53d3b /x11-toolkits
parent04453c63b4d212437d93ed72f7f7cc55dba51ecd (diff)
downloadFreeBSD-ports-cb34fc26289e627ae6aad72a11052f13e4e9cd31.zip
FreeBSD-ports-cb34fc26289e627ae6aad72a11052f13e4e9cd31.tar.gz
Backport a patch that will eventually appear in Tk 8.4 to make
sure a TkCursor structure member gets filled in correctly. Bump PORTREVISION. Approved by: dinoex (maintainer) Obtained from: Tk CVS repository on SourceForge
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/tk83/Makefile2
-rw-r--r--x11-toolkits/tk83/files/patch-tkCursor.c25
2 files changed, 26 insertions, 1 deletions
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index a4d6dea..15d926b 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tk
PORTVERSION= 8.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits tk83
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
diff --git a/x11-toolkits/tk83/files/patch-tkCursor.c b/x11-toolkits/tk83/files/patch-tkCursor.c
new file mode 100644
index 0000000..864d5fa
--- /dev/null
+++ b/x11-toolkits/tk83/files/patch-tkCursor.c
@@ -0,0 +1,25 @@
+--- ../generic/tkCursor.c 2001/08/15 15:44:36 1.7
++++ ../generic/tkCursor.c 2001/10/23 08:40:47 1.8
+@@ -276,13 +276,12 @@
+ cursorPtr->objRefCount = 0;
+ cursorPtr->otherTable = &dispPtr->cursorNameTable;
+ cursorPtr->hashPtr = nameHashPtr;
+- cursorPtr->nextPtr = NULL;
++ cursorPtr->nextPtr = existingCursorPtr;
+ cursorPtr->idHashPtr = Tcl_CreateHashEntry(&dispPtr->cursorIdTable,
+ (char *) cursorPtr->cursor, &new);
+ if (!new) {
+ panic("cursor already registered in Tk_GetCursor");
+ }
+- cursorPtr->nextPtr = existingCursorPtr;
+ Tcl_SetHashValue(nameHashPtr, cursorPtr);
+ Tcl_SetHashValue(cursorPtr->idHashPtr, cursorPtr);
+
+@@ -384,6 +383,7 @@
+ cursorPtr->objRefCount = 0;
+ cursorPtr->idHashPtr = Tcl_CreateHashEntry(&dispPtr->cursorIdTable,
+ (char *) cursorPtr->cursor, &new);
++ cursorPtr->nextPtr = NULL;
+
+ if (!new) {
+ panic("cursor already registered in Tk_GetCursorFromData");
OpenPOWER on IntegriCloud