Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20951
Modified Files:
blt-x86_64.patch
Log Message:
use gentoo approach to fix build on tcl/tk 8.6 and pass -fno-strict-aliasing to
be conservative in optimizations
Index: blt-x86_64.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11/blt-x86_64.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- blt-x86_64.patch 2 Mar 2013 03:30:45 -0000 1.4
+++ blt-x86_64.patch 15 Jul 2013 17:24:21 -0000 1.5
@@ -1,6 +1,6 @@
-diff -uNr blt2.4z/Makefile.in blt2.4z.fink/Makefile.in
---- blt2.4z/Makefile.in 2002-02-18 19:11:43.000000000 -0500
-+++ blt2.4z.fink/Makefile.in 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/Makefile.in blt2.4z/Makefile.in
+--- blt2.4z.orig/Makefile.in 2002-02-18 19:11:43.000000000 -0500
++++ blt2.4z/Makefile.in 2013-07-15 11:15:51.000000000 -0400
@@ -47,9 +47,9 @@
(cd library; $(MAKE) install)
(cd man; $(MAKE) install)
@@ -23,9 +23,9 @@
+ (cd man; $(MAKE) distclean)
+ (cd demos; $(MAKE) distclean)
$(RM) $(GENERATED_FILES)
-diff -uNr blt2.4z/configure blt2.4z.fink/configure
---- blt2.4z/configure 2002-10-04 01:33:59.000000000 -0400
-+++ blt2.4z.fink/configure 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/configure blt2.4z/configure
+--- blt2.4z.orig/configure 2002-10-04 01:33:59.000000000 -0400
++++ blt2.4z/configure 2013-07-15 11:15:51.000000000 -0400
@@ -3396,6 +3396,9 @@
*-hpux*)
SHLIB_SUFFIX="sl"
@@ -63,9 +63,9 @@
*)
build_shared="no"
;;
-diff -uNr blt2.4z/library/Makefile.in blt2.4z.fink/library/Makefile.in
---- blt2.4z/library/Makefile.in 2002-07-14 19:33:24.000000000 -0400
-+++ blt2.4z.fink/library/Makefile.in 2013-02-27 22:00:59.000000000 -0500
+diff -uNr blt2.4z.orig/library/Makefile.in blt2.4z/library/Makefile.in
+--- blt2.4z.orig/library/Makefile.in 2002-07-14 19:33:24.000000000 -0400
++++ blt2.4z/library/Makefile.in 2013-07-15 11:15:51.000000000 -0400
@@ -29,6 +29,7 @@
tabnotebook.tcl \
tabset.tcl \
@@ -83,9 +83,9 @@
mkdirs:
@for i in $(instdirs) ; do \
-diff -uNr blt2.4z/library/Makefile.vc blt2.4z.fink/library/Makefile.vc
---- blt2.4z/library/Makefile.vc 2002-08-21 02:20:51.000000000 -0400
-+++ blt2.4z.fink/library/Makefile.vc 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/library/Makefile.vc blt2.4z/library/Makefile.vc
+--- blt2.4z.orig/library/Makefile.vc 2002-08-21 02:20:51.000000000 -0400
++++ blt2.4z/library/Makefile.vc 2013-07-15 11:15:51.000000000 -0400
@@ -6,7 +6,6 @@
include ../win/makedefs
@@ -112,9 +112,9 @@
clean:
$(RM) pkgIndex.tcl
-diff -uNr blt2.4z/library/ZoomStack.itcl blt2.4z.fink/library/ZoomStack.itcl
---- blt2.4z/library/ZoomStack.itcl 2001-02-07 00:42:26.000000000 -0500
-+++ blt2.4z.fink/library/ZoomStack.itcl 2013-02-27 22:00:59.000000000
-0500
+diff -uNr blt2.4z.orig/library/ZoomStack.itcl blt2.4z/library/ZoomStack.itcl
+--- blt2.4z.orig/library/ZoomStack.itcl 2001-02-07 00:42:26.000000000
-0500
++++ blt2.4z/library/ZoomStack.itcl 2013-07-15 11:15:51.000000000 -0400
@@ -1,4 +1,6 @@
-import add itcl
+#import add itcl
@@ -131,9 +131,9 @@
private method Push { cmd }
private method Pop {}
private method MarkPoint { x y }
-diff -uNr blt2.4z/library/pkgIndex.tcl.in blt2.4z.fink/library/pkgIndex.tcl.in
---- blt2.4z/library/pkgIndex.tcl.in 2002-07-14 19:33:24.000000000 -0400
-+++ blt2.4z.fink/library/pkgIndex.tcl.in 2013-02-27 21:58:32.000000000
-0500
+diff -uNr blt2.4z.orig/library/pkgIndex.tcl.in blt2.4z/library/pkgIndex.tcl.in
+--- blt2.4z.orig/library/pkgIndex.tcl.in 2002-07-14 19:33:24.000000000
-0400
++++ blt2.4z/library/pkgIndex.tcl.in 2013-07-15 11:15:51.000000000 -0400
@@ -8,27 +8,14 @@
# Determine whether to load the full BLT library or
@@ -167,9 +167,9 @@
load $library BLT
}
-diff -uNr blt2.4z/src/Makefile.in blt2.4z.fink/src/Makefile.in
---- blt2.4z/src/Makefile.in 2002-07-15 05:31:29.000000000 -0400
-+++ blt2.4z.fink/src/Makefile.in 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/Makefile.in blt2.4z/src/Makefile.in
+--- blt2.4z.orig/src/Makefile.in 2002-07-15 05:31:29.000000000 -0400
++++ blt2.4z/src/Makefile.in 2013-07-15 11:15:51.000000000 -0400
@@ -230,7 +230,8 @@
distclean: clean
@@ -180,9 +180,9 @@
.c.o:
$(CC) -c $(CC_SWITCHES) $<
-diff -uNr blt2.4z/src/Makefile.vc blt2.4z.fink/src/Makefile.vc
---- blt2.4z/src/Makefile.vc 2002-09-07 16:12:10.000000000 -0400
-+++ blt2.4z.fink/src/Makefile.vc 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/Makefile.vc blt2.4z/src/Makefile.vc
+--- blt2.4z.orig/src/Makefile.vc 2002-09-07 16:12:10.000000000 -0400
++++ blt2.4z/src/Makefile.vc 2013-07-15 11:15:51.000000000 -0400
@@ -3,16 +3,15 @@
# Makefile for BLT library using VC++.
# ------------------------------------------------------------------------
@@ -451,9 +451,9 @@
+%.o : %.c
$(CC) -c $(CC_SWITCHES) -Fo$*.o $<
-
-diff -uNr blt2.4z/src/bltAlloc.c blt2.4z.fink/src/bltAlloc.c
---- blt2.4z/src/bltAlloc.c 2002-07-22 18:44:36.000000000 -0400
-+++ blt2.4z.fink/src/bltAlloc.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltAlloc.c blt2.4z/src/bltAlloc.c
+--- blt2.4z.orig/src/bltAlloc.c 2002-07-22 18:44:36.000000000 -0400
++++ blt2.4z/src/bltAlloc.c 2013-07-15 11:15:51.000000000 -0400
@@ -40,14 +40,23 @@
* Tcl_Alloc/Tcl_Free routines because they don't automatically cause
* a panic when not enough memory is available. There are cases (such
@@ -485,9 +485,9 @@
#else
Blt_MallocProc *Blt_MallocProcPtr = malloc;
-diff -uNr blt2.4z/src/bltBeep.c blt2.4z.fink/src/bltBeep.c
---- blt2.4z/src/bltBeep.c 2002-04-27 20:05:03.000000000 -0400
-+++ blt2.4z.fink/src/bltBeep.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltBeep.c blt2.4z/src/bltBeep.c
+--- blt2.4z.orig/src/bltBeep.c 2002-04-27 20:05:03.000000000 -0400
++++ blt2.4z/src/bltBeep.c 2013-07-15 11:15:51.000000000 -0400
@@ -51,7 +51,7 @@
int argc; /* Number of arguments. */
char **argv; /* Argument strings. */
@@ -497,9 +497,9 @@
if (argc > 2) {
Tcl_AppendResult(interp, "wrong # args: should be \"",
-diff -uNr blt2.4z/src/bltBgexec.c blt2.4z.fink/src/bltBgexec.c
---- blt2.4z/src/bltBgexec.c 2002-09-18 18:30:50.000000000 -0400
-+++ blt2.4z.fink/src/bltBgexec.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltBgexec.c blt2.4z/src/bltBgexec.c
+--- blt2.4z.orig/src/bltBgexec.c 2002-09-18 18:30:50.000000000 -0400
++++ blt2.4z/src/bltBgexec.c 2013-07-15 11:15:51.000000000 -0400
@@ -58,7 +58,7 @@
typedef int Process;
#endif
@@ -1017,9 +1017,9 @@
data[length] = '\0';
Tcl_SetResult(interp, data, TCL_VOLATILE);
#else
-diff -uNr blt2.4z/src/bltBitmap.c blt2.4z.fink/src/bltBitmap.c
---- blt2.4z/src/bltBitmap.c 2002-08-13 15:45:18.000000000 -0400
-+++ blt2.4z.fink/src/bltBitmap.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltBitmap.c blt2.4z/src/bltBitmap.c
+--- blt2.4z.orig/src/bltBitmap.c 2002-08-13 15:45:18.000000000 -0400
++++ blt2.4z/src/bltBitmap.c 2013-07-15 11:15:51.000000000 -0400
@@ -917,7 +917,7 @@
info.padLeft = info.padRight = 0;
info.padTop = info.padBottom = 0;
@@ -1038,9 +1038,9 @@
argc - 4, argv + 4, (char *)&info, 0) != TCL_OK) {
return TCL_ERROR;
}
-diff -uNr blt2.4z/src/bltBusy.c blt2.4z.fink/src/bltBusy.c
---- blt2.4z/src/bltBusy.c 2002-07-12 18:29:28.000000000 -0400
-+++ blt2.4z.fink/src/bltBusy.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltBusy.c blt2.4z/src/bltBusy.c
+--- blt2.4z.orig/src/bltBusy.c 2002-07-12 18:29:28.000000000 -0400
++++ blt2.4z/src/bltBusy.c 2013-07-15 11:15:51.000000000 -0400
@@ -418,7 +418,7 @@
Tk_Cursor oldCursor;
@@ -1050,9 +1050,9 @@
(char *)busyPtr, 0) != TCL_OK) {
return TCL_ERROR;
}
-diff -uNr blt2.4z/src/bltCanvEps.c blt2.4z.fink/src/bltCanvEps.c
---- blt2.4z/src/bltCanvEps.c 2002-08-15 01:22:10.000000000 -0400
-+++ blt2.4z.fink/src/bltCanvEps.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltCanvEps.c blt2.4z/src/bltCanvEps.c
+--- blt2.4z.orig/src/bltCanvEps.c 2002-08-15 01:22:10.000000000 -0400
++++ blt2.4z/src/bltCanvEps.c 2013-07-15 11:15:51.000000000 -0400
@@ -1054,7 +1054,7 @@
int width, height;
@@ -1085,9 +1085,9 @@
+ tagsOption.parseProc = (Tk_OptionParseProc *) Tk_CanvasTagsParseProc;
+ tagsOption.printProc = (Tk_OptionPrintProc *) Tk_CanvasTagsPrintProc;
}
-diff -uNr blt2.4z/src/bltColor.c blt2.4z.fink/src/bltColor.c
---- blt2.4z/src/bltColor.c 2002-08-09 21:29:33.000000000 -0400
-+++ blt2.4z.fink/src/bltColor.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltColor.c blt2.4z/src/bltColor.c
+--- blt2.4z.orig/src/bltColor.c 2002-08-09 21:29:33.000000000 -0400
++++ blt2.4z/src/bltColor.c 2013-07-15 11:15:51.000000000 -0400
@@ -535,15 +535,15 @@
for (i = 0; i < nPixels; i++, pixelPtr++) {
color.value = pixelPtr->value;
@@ -1107,9 +1107,9 @@
}
Blt_DeleteHashTable(&colorTable);
return nColors;
-diff -uNr blt2.4z/src/bltConfig.c blt2.4z.fink/src/bltConfig.c
---- blt2.4z/src/bltConfig.c 2002-09-18 18:30:51.000000000 -0400
-+++ blt2.4z.fink/src/bltConfig.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltConfig.c blt2.4z/src/bltConfig.c
+--- blt2.4z.orig/src/bltConfig.c 2002-09-18 18:30:51.000000000 -0400
++++ blt2.4z/src/bltConfig.c 2013-07-15 11:15:51.000000000 -0400
@@ -275,7 +275,7 @@
char *widgRec; /* Cubicle structure record */
int offset; /* Offset of style in record */
@@ -1221,9 +1221,9 @@
flags);
if (isTemporary) {
Tk_DestroyWindow(tkwin);
-diff -uNr blt2.4z/src/bltContainer.c blt2.4z.fink/src/bltContainer.c
---- blt2.4z/src/bltContainer.c 2002-07-14 19:33:24.000000000 -0400
-+++ blt2.4z.fink/src/bltContainer.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltContainer.c blt2.4z/src/bltContainer.c
+--- blt2.4z.orig/src/bltContainer.c 2002-07-14 19:33:24.000000000 -0400
++++ blt2.4z/src/bltContainer.c 2013-07-15 11:15:51.000000000 -0400
@@ -389,7 +389,7 @@
Tcl_Interp *interp;
Container *cntrPtr;
@@ -1251,9 +1251,9 @@
(char *)cntrPtr, flags) != TCL_OK) {
return TCL_ERROR;
}
-diff -uNr blt2.4z/src/bltDragdrop.c blt2.4z.fink/src/bltDragdrop.c
---- blt2.4z/src/bltDragdrop.c 2002-07-18 02:35:32.000000000 -0400
-+++ blt2.4z.fink/src/bltDragdrop.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltDragdrop.c blt2.4z/src/bltDragdrop.c
+--- blt2.4z.orig/src/bltDragdrop.c 2002-07-18 02:35:32.000000000 -0400
++++ blt2.4z/src/bltDragdrop.c 2013-07-15 11:15:51.000000000 -0400
@@ -1065,7 +1065,7 @@
Token *tokenPtr;
@@ -1272,9 +1272,9 @@
(char *)srcPtr, flags) != TCL_OK) {
return TCL_ERROR;
}
-diff -uNr blt2.4z/src/bltGrAxis.c blt2.4z.fink/src/bltGrAxis.c
---- blt2.4z/src/bltGrAxis.c 2002-09-18 18:30:51.000000000 -0400
-+++ blt2.4z.fink/src/bltGrAxis.c 2013-02-27 22:08:14.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltGrAxis.c blt2.4z/src/bltGrAxis.c
+--- blt2.4z.orig/src/bltGrAxis.c 2002-09-18 18:30:51.000000000 -0400
++++ blt2.4z/src/bltGrAxis.c 2013-07-15 11:15:51.000000000 -0400
@@ -669,7 +669,7 @@
char *widgRec; /* Pointer to structure record. */
int offset; /* Offset of field in structure. */
@@ -1570,9 +1570,9 @@
* the argument list. Needed only for UseOp.
*/
axisPtr = Blt_GetFirstAxis(graphPtr->margins[margin].axes);
-diff -uNr blt2.4z/src/bltGrBar.c blt2.4z.fink/src/bltGrBar.c
---- blt2.4z/src/bltGrBar.c 2002-09-18 18:30:51.000000000 -0400
-+++ blt2.4z.fink/src/bltGrBar.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltGrBar.c blt2.4z/src/bltGrBar.c
+--- blt2.4z.orig/src/bltGrBar.c 2002-09-18 18:30:51.000000000 -0400
++++ blt2.4z/src/bltGrBar.c 2013-07-15 11:15:51.000000000 -0400
@@ -2197,13 +2197,13 @@
if (isNew) {
count = 1;
@@ -1604,9 +1604,9 @@
infoPtr->freq = count;
infoPtr->axes = keyPtr->axes;
Blt_SetHashValue(h2Ptr, infoPtr);
-diff -uNr blt2.4z/src/bltGrElem.c blt2.4z.fink/src/bltGrElem.c
---- blt2.4z/src/bltGrElem.c 2002-09-18 18:30:51.000000000 -0400
-+++ blt2.4z.fink/src/bltGrElem.c 2013-02-27 21:59:06.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltGrElem.c blt2.4z/src/bltGrElem.c
+--- blt2.4z.orig/src/bltGrElem.c 2002-09-18 18:30:51.000000000 -0400
++++ blt2.4z/src/bltGrElem.c 2013-07-15 11:15:51.000000000 -0400
@@ -1215,9 +1215,7 @@
{
int nNames; /* Number of names found in Tcl name
list */
@@ -1758,9 +1758,9 @@
graphPtr->flags |= RESET_AXES;
elemPtr->flags |= MAP_ITEM;
}
-diff -uNr blt2.4z/src/bltGrGrid.c blt2.4z.fink/src/bltGrGrid.c
---- blt2.4z/src/bltGrGrid.c 2002-06-11 03:13:55.000000000 -0400
-+++ blt2.4z.fink/src/bltGrGrid.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltGrGrid.c blt2.4z/src/bltGrGrid.c
+--- blt2.4z.orig/src/bltGrGrid.c 2002-06-11 03:13:55.000000000 -0400
++++ blt2.4z/src/bltGrGrid.c 2013-07-15 11:15:51.000000000 -0400
@@ -365,7 +365,7 @@
return Tk_ConfigureInfo(interp, graphPtr->tkwin, configSpecs,
(char *)gridPtr, argv[3], flags);
@@ -1770,9 +1770,9 @@
argc - 3, argv + 3, (char *)gridPtr, flags) != TCL_OK) {
return TCL_ERROR;
}
-diff -uNr blt2.4z/src/bltGrHairs.c blt2.4z.fink/src/bltGrHairs.c
---- blt2.4z/src/bltGrHairs.c 2002-06-17 19:07:19.000000000 -0400
-+++ blt2.4z.fink/src/bltGrHairs.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltGrHairs.c blt2.4z/src/bltGrHairs.c
+--- blt2.4z.orig/src/bltGrHairs.c 2002-06-17 19:07:19.000000000 -0400
++++ blt2.4z/src/bltGrHairs.c 2013-07-15 11:15:51.000000000 -0400
@@ -390,7 +390,7 @@
return Tk_ConfigureInfo(interp, graphPtr->tkwin, configSpecs,
(char *)chPtr, argv[3], 0);
@@ -1782,9 +1782,9 @@
argv + 3, (char *)chPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) {
return TCL_ERROR;
}
-diff -uNr blt2.4z/src/bltGrLegd.c blt2.4z.fink/src/bltGrLegd.c
---- blt2.4z/src/bltGrLegd.c 2002-09-18 18:30:51.000000000 -0400
-+++ blt2.4z.fink/src/bltGrLegd.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltGrLegd.c blt2.4z/src/bltGrLegd.c
+--- blt2.4z.orig/src/bltGrLegd.c 2002-09-18 18:30:51.000000000 -0400
++++ blt2.4z/src/bltGrLegd.c 2013-07-15 11:15:51.000000000 -0400
@@ -1406,7 +1406,7 @@
return Tk_ConfigureInfo(interp, graphPtr->tkwin, configSpecs,
(char *)legendPtr, argv[3], flags);
@@ -1794,9 +1794,9 @@
argv + 3, (char *)legendPtr, flags) != TCL_OK) {
return TCL_ERROR;
}
-diff -uNr blt2.4z/src/bltGrLine.c blt2.4z.fink/src/bltGrLine.c
---- blt2.4z/src/bltGrLine.c 2002-10-14 19:31:24.000000000 -0400
-+++ blt2.4z.fink/src/bltGrLine.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltGrLine.c blt2.4z/src/bltGrLine.c
+--- blt2.4z.orig/src/bltGrLine.c 2002-10-14 19:31:24.000000000 -0400
++++ blt2.4z/src/bltGrLine.c 2013-07-15 11:15:51.000000000 -0400
@@ -1211,7 +1211,7 @@
NameOfSmooth(value)
Smoothing value;
@@ -1806,9 +1806,9 @@
return "unknown smooth value";
}
return smoothingInfo[value].name;
-diff -uNr blt2.4z/src/bltGrMarker.c blt2.4z.fink/src/bltGrMarker.c
---- blt2.4z/src/bltGrMarker.c 2002-09-18 18:30:51.000000000 -0400
-+++ blt2.4z.fink/src/bltGrMarker.c 2013-02-27 21:59:48.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltGrMarker.c blt2.4z/src/bltGrMarker.c
+--- blt2.4z.orig/src/bltGrMarker.c 2002-09-18 18:30:51.000000000 -0400
++++ blt2.4z/src/bltGrMarker.c 2013-07-15 11:15:51.000000000 -0400
@@ -29,6 +29,9 @@
#include "bltChain.h"
#include "bltGrElem.h"
@@ -2035,9 +2035,9 @@
(!markerPtr->hidden) && (markerPtr->state == STATE_NORMAL)) {
if ((*markerPtr->classPtr->pointProc) (markerPtr, &point)) {
return markerPtr;
-diff -uNr blt2.4z/src/bltGrMisc.c blt2.4z.fink/src/bltGrMisc.c
---- blt2.4z/src/bltGrMisc.c 2002-07-17 05:56:00.000000000 -0400
-+++ blt2.4z.fink/src/bltGrMisc.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltGrMisc.c blt2.4z/src/bltGrMisc.c
+--- blt2.4z.orig/src/bltGrMisc.c 2002-07-17 05:56:00.000000000 -0400
++++ blt2.4z/src/bltGrMisc.c 2013-07-15 11:15:51.000000000 -0400
@@ -260,7 +260,7 @@
{
ColorPair *pairPtr = (ColorPair *)(widgRec + offset);
@@ -2047,9 +2047,9 @@
sample.fgColor = sample.bgColor = NULL;
if ((string != NULL) && (*string != '\0')) {
-diff -uNr blt2.4z/src/bltGrPen.c blt2.4z.fink/src/bltGrPen.c
---- blt2.4z/src/bltGrPen.c 2002-09-18 18:30:51.000000000 -0400
-+++ blt2.4z.fink/src/bltGrPen.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltGrPen.c blt2.4z/src/bltGrPen.c
+--- blt2.4z.orig/src/bltGrPen.c 2002-09-18 18:30:51.000000000 -0400
++++ blt2.4z/src/bltGrPen.c 2013-07-15 11:15:51.000000000 -0400
@@ -215,7 +215,7 @@
Tcl_FreeProc **freeProcPtr; /* Not used. */
{
@@ -2068,9 +2068,9 @@
nOpts, options, (char *)penPtr, flags) != TCL_OK) {
break;
}
-diff -uNr blt2.4z/src/bltGrPs.c blt2.4z.fink/src/bltGrPs.c
---- blt2.4z/src/bltGrPs.c 2002-08-09 21:29:33.000000000 -0400
-+++ blt2.4z.fink/src/bltGrPs.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltGrPs.c blt2.4z/src/bltGrPs.c
+--- blt2.4z.orig/src/bltGrPs.c 2002-08-09 21:29:33.000000000 -0400
++++ blt2.4z/src/bltGrPs.c 2013-07-15 11:15:51.000000000 -0400
@@ -418,7 +418,7 @@
return Tk_ConfigureInfo(interp, graphPtr->tkwin, configSpecs,
(char *)psPtr, argv[3], flags);
@@ -2089,9 +2089,9 @@
argv + 3, (char *)psPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) {
return TCL_ERROR;
}
-diff -uNr blt2.4z/src/bltGraph.c blt2.4z.fink/src/bltGraph.c
---- blt2.4z/src/bltGraph.c 2002-09-18 18:30:51.000000000 -0400
-+++ blt2.4z.fink/src/bltGraph.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltGraph.c blt2.4z/src/bltGraph.c
+--- blt2.4z.orig/src/bltGraph.c 2002-09-18 18:30:51.000000000 -0400
++++ blt2.4z/src/bltGraph.c 2013-07-15 11:15:51.000000000 -0400
@@ -926,7 +926,7 @@
if (InitPens(graphPtr) != TCL_OK) {
goto error;
@@ -2110,9 +2110,9 @@
argv + 2, (char *)graphPtr, flags) != TCL_OK) {
return TCL_ERROR;
}
-diff -uNr blt2.4z/src/bltHash.c blt2.4z.fink/src/bltHash.c
---- blt2.4z/src/bltHash.c 2002-08-09 03:15:18.000000000 -0400
-+++ blt2.4z.fink/src/bltHash.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltHash.c blt2.4z/src/bltHash.c
+--- blt2.4z.orig/src/bltHash.c 2002-08-09 03:15:18.000000000 -0400
++++ blt2.4z/src/bltHash.c 2013-07-15 11:15:51.000000000 -0400
@@ -1302,7 +1302,7 @@
sprintf(result, "%ld entries in table, %ld buckets\n",
tablePtr->numEntries, tablePtr->numBuckets);
@@ -2149,9 +2149,9 @@
#endif
return result;
}
-diff -uNr blt2.4z/src/bltHash.h.in blt2.4z.fink/src/bltHash.h.in
---- blt2.4z/src/bltHash.h.in 2002-07-13 20:08:13.000000000 -0400
-+++ blt2.4z.fink/src/bltHash.h.in 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltHash.h.in blt2.4z/src/bltHash.h.in
+--- blt2.4z.orig/src/bltHash.h.in 2002-07-13 20:08:13.000000000 -0400
++++ blt2.4z/src/bltHash.h.in 2013-07-15 11:15:51.000000000 -0400
@@ -88,7 +88,7 @@
* Acceptable key types for hash tables:
*/
@@ -2161,9 +2161,9 @@
/*
* Forward declaration of Blt_HashTable. Needed by some C++ compilers
-diff -uNr blt2.4z/src/bltHierbox.c blt2.4z.fink/src/bltHierbox.c
---- blt2.4z/src/bltHierbox.c 2002-09-18 23:02:09.000000000 -0400
-+++ blt2.4z.fink/src/bltHierbox.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltHierbox.c blt2.4z/src/bltHierbox.c
+--- blt2.4z.orig/src/bltHierbox.c 2002-09-18 23:02:09.000000000 -0400
++++ blt2.4z/src/bltHierbox.c 2013-07-15 11:15:51.000000000 -0400
@@ -2077,7 +2077,7 @@
/* Generate a unique node serial number. */
do {
@@ -2319,9 +2319,9 @@
argc, argv, (char *)hboxPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) {
return TCL_ERROR;
}
-diff -uNr blt2.4z/src/bltHtext.c blt2.4z.fink/src/bltHtext.c
---- blt2.4z/src/bltHtext.c 2002-07-17 05:56:00.000000000 -0400
-+++ blt2.4z.fink/src/bltHtext.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltHtext.c blt2.4z/src/bltHtext.c
+--- blt2.4z.orig/src/bltHtext.c 2002-07-17 05:56:00.000000000 -0400
++++ blt2.4z/src/bltHtext.c 2013-07-15 11:15:51.000000000 -0400
@@ -40,6 +40,13 @@
* of the virtual text.
*/
@@ -2515,9 +2515,9 @@
argv + 2, (char *)htPtr, 0) != TCL_OK) ||
(ConfigureText(interp, htPtr) != TCL_OK)) {
Tk_DestroyWindow(htPtr->tkwin);
-diff -uNr blt2.4z/src/bltImage.c blt2.4z.fink/src/bltImage.c
---- blt2.4z/src/bltImage.c 2002-08-15 01:22:10.000000000 -0400
-+++ blt2.4z.fink/src/bltImage.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltImage.c blt2.4z/src/bltImage.c
+--- blt2.4z.orig/src/bltImage.c 2002-08-15 01:22:10.000000000 -0400
++++ blt2.4z/src/bltImage.c 2013-07-15 11:15:51.000000000 -0400
@@ -2448,7 +2448,7 @@
color.Red = red >> 8;
color.Green = green >> 8;
@@ -2536,9 +2536,9 @@
Blt_Free(lut);
return TCL_OK;
}
-diff -uNr blt2.4z/src/bltInit.c blt2.4z.fink/src/bltInit.c
---- blt2.4z/src/bltInit.c 2002-09-10 01:12:33.000000000 -0400
-+++ blt2.4z.fink/src/bltInit.c 2013-02-27 21:59:06.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltInit.c blt2.4z/src/bltInit.c
+--- blt2.4z.orig/src/bltInit.c 2002-09-10 01:12:33.000000000 -0400
++++ blt2.4z/src/bltInit.c 2013-07-15 11:15:51.000000000 -0400
@@ -28,7 +28,7 @@
#include <bltInt.h>
@@ -2697,9 +2697,9 @@
}
#endif
return TCL_OK;
-diff -uNr blt2.4z/src/bltInt.h blt2.4z.fink/src/bltInt.h
---- blt2.4z/src/bltInt.h 2002-08-21 16:13:12.000000000 -0400
-+++ blt2.4z.fink/src/bltInt.h 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltInt.h blt2.4z/src/bltInt.h
+--- blt2.4z.orig/src/bltInt.h 2002-08-21 16:13:12.000000000 -0400
++++ blt2.4z/src/bltInt.h 2013-07-15 11:15:51.000000000 -0400
@@ -724,6 +724,10 @@
extern Tk_OptionParseProc Blt_StringToEnum;
extern Tk_OptionPrintProc Blt_EnumToString;
@@ -2711,9 +2711,9 @@
extern int Blt_ConfigModified _ANSI_ARGS_(TCL_VARARGS(Tk_ConfigSpec *,
specs));
extern void Blt_DStringAppendElements _ANSI_ARGS_(TCL_VARARGS(Tcl_DString *,
args));
-diff -uNr blt2.4z/src/bltNsUtil.c blt2.4z.fink/src/bltNsUtil.c
---- blt2.4z/src/bltNsUtil.c 2002-09-18 18:30:51.000000000 -0400
-+++ blt2.4z.fink/src/bltNsUtil.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltNsUtil.c blt2.4z/src/bltNsUtil.c
+--- blt2.4z.orig/src/bltNsUtil.c 2002-09-18 18:30:51.000000000 -0400
++++ blt2.4z/src/bltNsUtil.c 2013-07-15 11:15:51.000000000 -0400
@@ -286,7 +286,7 @@
* this "real" command. */
} Command;
@@ -2763,9 +2763,9 @@
}
/*ARGSUSED*/
-diff -uNr blt2.4z/src/bltNsUtil.h blt2.4z.fink/src/bltNsUtil.h
---- blt2.4z/src/bltNsUtil.h 2002-07-18 02:35:32.000000000 -0400
-+++ blt2.4z.fink/src/bltNsUtil.h 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltNsUtil.h blt2.4z/src/bltNsUtil.h
+--- blt2.4z.orig/src/bltNsUtil.h 2002-07-18 02:35:32.000000000 -0400
++++ blt2.4z/src/bltNsUtil.h 2013-07-15 11:15:51.000000000 -0400
@@ -48,7 +48,7 @@
@@ -2794,9 +2794,9 @@
EXTERN Tcl_Var Tcl_FindNamespaceVar _ANSI_ARGS_((Tcl_Interp *interp, char
*name,
Tcl_Namespace *contextNsPtr, int flags));
-diff -uNr blt2.4z/src/bltObjConfig.c blt2.4z.fink/src/bltObjConfig.c
---- blt2.4z/src/bltObjConfig.c 2002-09-18 18:30:51.000000000 -0400
-+++ blt2.4z.fink/src/bltObjConfig.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltObjConfig.c blt2.4z/src/bltObjConfig.c
+--- blt2.4z.orig/src/bltObjConfig.c 2002-09-18 18:30:51.000000000 -0400
++++ blt2.4z/src/bltObjConfig.c 2013-07-15 11:15:51.000000000 -0400
@@ -1225,7 +1225,7 @@
if (Tcl_GetBooleanFromObj(interp, objPtr, &bool) != TCL_OK) {
return TCL_ERROR;
@@ -2815,10 +2815,32 @@
return Tcl_NewBooleanObj((flag != 0));
}
-diff -uNr blt2.4z/src/bltScrollbar.c blt2.4z.fink/src/bltScrollbar.c
---- blt2.4z/src/bltScrollbar.c 2002-07-17 18:38:54.000000000 -0400
-+++ blt2.4z.fink/src/bltScrollbar.c 2013-02-27 21:58:32.000000000 -0500
-@@ -814,7 +814,7 @@
+diff -uNr blt2.4z.orig/src/bltScrollbar.c blt2.4z/src/bltScrollbar.c
+--- blt2.4z.orig/src/bltScrollbar.c 2002-07-17 18:38:54.000000000 -0400
++++ blt2.4z/src/bltScrollbar.c 2013-07-15 11:15:51.000000000 -0400
+@@ -22,6 +22,12 @@
+
+ #include "bltTile.h"
+
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
++#define Tcl_GetStringResult(x) x->result
++#define Tcl_GetErrorLine(x) x->errorLine
++#define Tcl_SetResult(x, y, z) x->result = y
++#endif
++
+ extern Tk_CustomOption bltTileOption;
+
+ #define NORMAL_BG "#d9d9d9"
+@@ -534,7 +540,7 @@
+ } else {
+ fraction = ((double)pixels / (double)barWidth);
+ }
+- sprintf(interp->result, "%g", fraction);
++ sprintf(Tcl_GetStringResult(interp), "%g", fraction);
+ } else if ((c == 'f') && (strncmp(argv[1], "fraction", length) == 0)) {
+ int x, y, pos, barWidth;
+ double fraction;
+@@ -814,7 +820,7 @@
XGCValues gcValues;
GC new;
@@ -2827,9 +2849,9 @@
argc, argv, (char *)scrollPtr, flags) != TCL_OK) {
return TCL_ERROR;
}
-diff -uNr blt2.4z/src/bltSpline.c blt2.4z.fink/src/bltSpline.c
---- blt2.4z/src/bltSpline.c 2002-07-17 05:56:01.000000000 -0400
-+++ blt2.4z.fink/src/bltSpline.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltSpline.c blt2.4z/src/bltSpline.c
+--- blt2.4z.orig/src/bltSpline.c 2002-07-17 05:56:01.000000000 -0400
++++ blt2.4z/src/bltSpline.c 2013-07-15 11:15:51.000000000 -0400
@@ -228,14 +228,14 @@
int which;
{
@@ -2848,9 +2870,9 @@
if (which == 4) { /* Case 4. */
Y1 = (p->x + c1) / 2.0;
-diff -uNr blt2.4z/src/bltTable.c blt2.4z.fink/src/bltTable.c
---- blt2.4z/src/bltTable.c 2002-10-14 19:31:24.000000000 -0400
-+++ blt2.4z.fink/src/bltTable.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltTable.c blt2.4z/src/bltTable.c
+--- blt2.4z.orig/src/bltTable.c 2002-10-14 19:31:24.000000000 -0400
++++ blt2.4z/src/bltTable.c 2013-07-15 11:15:51.000000000 -0400
@@ -1201,7 +1201,7 @@
oldRowSpan = entryPtr->row.span;
oldColSpan = entryPtr->column.span;
@@ -2932,9 +2954,9 @@
entryConfigSpecs, argc, argv, (char *)entryPtr,
TK_CONFIG_ARGV_ONLY);
}
-diff -uNr blt2.4z/src/bltTabnotebook.c blt2.4z.fink/src/bltTabnotebook.c
---- blt2.4z/src/bltTabnotebook.c 2002-09-18 18:30:51.000000000 -0400
-+++ blt2.4z.fink/src/bltTabnotebook.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltTabnotebook.c blt2.4z/src/bltTabnotebook.c
+--- blt2.4z.orig/src/bltTabnotebook.c 2002-09-18 18:30:51.000000000 -0400
++++ blt2.4z/src/bltTabnotebook.c 2013-07-15 11:15:51.000000000 -0400
@@ -2766,7 +2766,7 @@
GC newGC;
@@ -2953,9 +2975,9 @@
nOpts, options, (char *)tabPtr, TK_CONFIG_ARGV_ONLY);
if (result == TCL_OK) {
result = ConfigureTab(nbPtr, tabPtr);
-diff -uNr blt2.4z/src/bltTabset.c blt2.4z.fink/src/bltTabset.c
---- blt2.4z/src/bltTabset.c 2002-09-18 18:30:51.000000000 -0400
-+++ blt2.4z.fink/src/bltTabset.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltTabset.c blt2.4z/src/bltTabset.c
+--- blt2.4z.orig/src/bltTabset.c 2002-09-18 18:30:51.000000000 -0400
++++ blt2.4z/src/bltTabset.c 2013-07-15 11:15:51.000000000 -0400
@@ -2812,7 +2812,7 @@
GC newGC;
@@ -2974,10 +2996,23 @@
nOpts, options, (char *)tabPtr, TK_CONFIG_ARGV_ONLY);
if (result == TCL_OK) {
result = ConfigureTab(setPtr, tabPtr);
-diff -uNr blt2.4z/src/bltTed.c blt2.4z.fink/src/bltTed.c
---- blt2.4z/src/bltTed.c 2002-05-16 16:46:00.000000000 -0400
-+++ blt2.4z.fink/src/bltTed.c 2013-02-27 21:58:32.000000000 -0500
-@@ -826,7 +826,7 @@
+diff -uNr blt2.4z.orig/src/bltTed.c blt2.4z/src/bltTed.c
+--- blt2.4z.orig/src/bltTed.c 2002-05-16 16:46:00.000000000 -0400
++++ blt2.4z/src/bltTed.c 2013-07-15 11:15:51.000000000 -0400
+@@ -29,6 +29,12 @@
+
+ #include "bltTable.h"
+
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
++#define Tcl_GetStringResult(x) x->result
++#define Tcl_GetErrorLine(x) x->errorLine
++#define Tcl_SetResult(x, y, z) x->result = y
++#endif
++
+ extern Tk_CustomOption bltDistanceOption;
+ extern Tk_CustomOption bltDashesOption;
+
+@@ -826,7 +832,7 @@
GC newGC;
unsigned long gcMask;
@@ -2986,9 +3021,36 @@
argc, argv, (char *)tedPtr, flags) != TCL_OK) {
return TCL_ERROR;
}
-diff -uNr blt2.4z/src/bltText.c blt2.4z.fink/src/bltText.c
---- blt2.4z/src/bltText.c 2002-08-13 15:45:20.000000000 -0400
-+++ blt2.4z.fink/src/bltText.c 2013-02-27 21:58:32.000000000 -0500
+@@ -1504,7 +1510,7 @@
+ tablePtr->flags |= ARRANGE_PENDING;
+ Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr);
+ }
+- interp->result = Tk_PathName(tedPtr->tkwin);
++ Tcl_SetResult(interp, (char* )Tk_PathName(tedPtr->tkwin), TCL_VOLATILE);
+ tedPtr->flags |= LAYOUT_PENDING;
+ EventuallyRedraw(tedPtr);
+ return TCL_OK;
+@@ -1678,7 +1684,7 @@
+ tedPtr->activeRectArr[4].width = grip - 1;
+ tedPtr->activeRectArr[4].height = grip - 1;
+
+- interp->result = Tk_PathName(entryPtr->tkwin);
++ Tcl_SetResult (interp, (char *)Tk_PathName(entryPtr->tkwin),
TCL_VOLATILE);
+ active = 1;
+ break;
+ }
+@@ -1751,7 +1757,7 @@
+ tablePtr->flags |= ARRANGE_PENDING;
+ Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr);
+ }
+- interp->result = Tk_PathName(tedPtr->tkwin);
++ Tcl_SetResult (interp, (char *)Tk_PathName(tedPtr->tkwin), TCL_VOLATILE);
+ tedPtr->flags |= LAYOUT_PENDING;
+ EventuallyRedraw(tedPtr);
+ return TCL_OK;
+diff -uNr blt2.4z.orig/src/bltText.c blt2.4z/src/bltText.c
+--- blt2.4z.orig/src/bltText.c 2002-08-13 15:45:20.000000000 -0400
++++ blt2.4z/src/bltText.c 2013-07-15 11:15:51.000000000 -0400
@@ -35,28 +35,196 @@
static int initialized;
@@ -3296,9 +3358,9 @@
void
Blt_DrawText2(tkwin, drawable, string, tsPtr, x, y, areaPtr)
-diff -uNr blt2.4z/src/bltTree.c blt2.4z.fink/src/bltTree.c
---- blt2.4z/src/bltTree.c 2002-09-29 01:44:12.000000000 -0400
-+++ blt2.4z.fink/src/bltTree.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltTree.c blt2.4z/src/bltTree.c
+--- blt2.4z.orig/src/bltTree.c 2002-09-29 01:44:12.000000000 -0400
++++ blt2.4z/src/bltTree.c 2013-07-15 11:15:51.000000000 -0400
@@ -95,17 +95,16 @@
*/
@@ -3357,9 +3419,9 @@
if (hPtr != NULL) {
return (Blt_TreeNode)Blt_GetHashValue(hPtr);
}
-diff -uNr blt2.4z/src/bltTreeCmd.c blt2.4z.fink/src/bltTreeCmd.c
---- blt2.4z/src/bltTreeCmd.c 2002-09-27 18:23:01.000000000 -0400
-+++ blt2.4z.fink/src/bltTreeCmd.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltTreeCmd.c blt2.4z/src/bltTreeCmd.c
+--- blt2.4z.orig/src/bltTreeCmd.c 2002-09-27 18:23:01.000000000 -0400
++++ blt2.4z/src/bltTreeCmd.c 2013-07-15 11:15:51.000000000 -0400
@@ -950,7 +950,7 @@
Tcl_Interp *interp = cmdPtr->interp;
Blt_Tree tree = cmdPtr->tree;
@@ -3432,9 +3494,9 @@
node = Blt_TreeGetNode(cmdPtr->tree, inode);
if (node != NULL) {
DeleteNode(cmdPtr, node);
-diff -uNr blt2.4z/src/bltTreeView.c blt2.4z.fink/src/bltTreeView.c
---- blt2.4z/src/bltTreeView.c 2002-08-16 00:15:04.000000000 -0400
-+++ blt2.4z.fink/src/bltTreeView.c 2013-02-27 21:59:06.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltTreeView.c blt2.4z/src/bltTreeView.c
+--- blt2.4z.orig/src/bltTreeView.c 2002-08-16 00:15:04.000000000 -0400
++++ blt2.4z/src/bltTreeView.c 2013-07-15 11:15:51.000000000 -0400
@@ -1055,10 +1055,10 @@
if (isNew) {
refCount = 1;
@@ -3577,9 +3639,9 @@
columnWidth = columnPtr->width;
cx = x;
if (columnPtr->position == Blt_ChainGetLength(tvPtr->colChainPtr)) {
-diff -uNr blt2.4z/src/bltTreeViewEdit.c blt2.4z.fink/src/bltTreeViewEdit.c
---- blt2.4z/src/bltTreeViewEdit.c 2002-09-14 16:07:43.000000000 -0400
-+++ blt2.4z.fink/src/bltTreeViewEdit.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltTreeViewEdit.c blt2.4z/src/bltTreeViewEdit.c
+--- blt2.4z.orig/src/bltTreeViewEdit.c 2002-09-14 16:07:43.000000000 -0400
++++ blt2.4z/src/bltTreeViewEdit.c 2013-07-15 11:15:51.000000000 -0400
@@ -1177,9 +1177,15 @@
rightPos = count;
if ((rightPos < tbPtr->selFirst) || (leftPos > tbPtr->selLast)) {
@@ -3612,9 +3674,9 @@
}
if ((tbPtr->flags & TEXTBOX_FOCUS) && (tbPtr->cursorOn)) {
int left, top, right, bottom;
-diff -uNr blt2.4z/src/bltTreeViewStyle.c blt2.4z.fink/src/bltTreeViewStyle.c
---- blt2.4z/src/bltTreeViewStyle.c 2002-07-22 18:18:40.000000000 -0400
-+++ blt2.4z.fink/src/bltTreeViewStyle.c 2013-02-27 21:58:32.000000000
-0500
+diff -uNr blt2.4z.orig/src/bltTreeViewStyle.c blt2.4z/src/bltTreeViewStyle.c
+--- blt2.4z.orig/src/bltTreeViewStyle.c 2002-07-22 18:18:40.000000000
-0400
++++ blt2.4z/src/bltTreeViewStyle.c 2013-07-15 11:15:51.000000000 -0400
@@ -846,6 +846,11 @@
*----------------------------------------------------------------------
*/
@@ -3627,9 +3689,9 @@
static int
EditTextBox(tvPtr, entryPtr, valuePtr, stylePtr)
TreeView *tvPtr;
-diff -uNr blt2.4z/src/bltUnixDnd.c blt2.4z.fink/src/bltUnixDnd.c
---- blt2.4z/src/bltUnixDnd.c 2002-07-13 20:08:56.000000000 -0400
-+++ blt2.4z.fink/src/bltUnixDnd.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltUnixDnd.c blt2.4z/src/bltUnixDnd.c
+--- blt2.4z.orig/src/bltUnixDnd.c 2002-07-13 20:08:56.000000000 -0400
++++ blt2.4z/src/bltUnixDnd.c 2013-07-15 11:15:51.000000000 -0400
@@ -1834,7 +1834,7 @@
unsigned long gcMask;
@@ -3657,9 +3719,9 @@
argv + 3, (char *)dndPtr, 0) != TCL_OK) {
return TCL_ERROR;
}
-diff -uNr blt2.4z/src/bltUnixImage.c blt2.4z.fink/src/bltUnixImage.c
---- blt2.4z/src/bltUnixImage.c 2002-08-16 00:15:04.000000000 -0400
-+++ blt2.4z.fink/src/bltUnixImage.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltUnixImage.c blt2.4z/src/bltUnixImage.c
+--- blt2.4z.orig/src/bltUnixImage.c 2002-08-16 00:15:04.000000000 -0400
++++ blt2.4z/src/bltUnixImage.c 2013-07-15 11:15:51.000000000 -0400
@@ -574,7 +574,7 @@
destPtr = Blt_ColorImageBits(image);
endPtr = destPtr + nPixels;
@@ -3669,9 +3731,9 @@
colorPtr = (XColor *)Blt_GetHashValue(hPtr);
destPtr->Red = lut[colorPtr->red >> 8];
destPtr->Green = lut[colorPtr->green >> 8];
-diff -uNr blt2.4z/src/bltUnixPipe.c blt2.4z.fink/src/bltUnixPipe.c
---- blt2.4z/src/bltUnixPipe.c 2002-06-22 15:21:05.000000000 -0400
-+++ blt2.4z.fink/src/bltUnixPipe.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltUnixPipe.c blt2.4z/src/bltUnixPipe.c
+--- blt2.4z.orig/src/bltUnixPipe.c 2002-06-22 15:21:05.000000000 -0400
++++ blt2.4z/src/bltUnixPipe.c 2013-07-15 11:15:51.000000000 -0400
@@ -477,7 +477,7 @@
* Reap the child process now if an error occurred during its
* startup.
@@ -3681,9 +3743,9 @@
}
if (errPipeIn >= 0) {
CloseFile(errPipeIn);
-diff -uNr blt2.4z/src/bltUtil.c blt2.4z.fink/src/bltUtil.c
---- blt2.4z/src/bltUtil.c 2002-08-21 16:13:12.000000000 -0400
-+++ blt2.4z.fink/src/bltUtil.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltUtil.c blt2.4z/src/bltUtil.c
+--- blt2.4z.orig/src/bltUtil.c 2002-08-21 16:13:12.000000000 -0400
++++ blt2.4z/src/bltUtil.c 2013-07-15 11:15:51.000000000 -0400
@@ -793,10 +793,10 @@
if (isNew) {
refCount = 0;
@@ -3712,9 +3774,58 @@
}
} else {
fprintf(stderr, "tried to release unknown identifier \"%s\"\n", uid);
-diff -uNr blt2.4z/src/bltWinDraw.c blt2.4z.fink/src/bltWinDraw.c
---- blt2.4z/src/bltWinDraw.c 2002-09-07 16:38:08.000000000 -0400
-+++ blt2.4z.fink/src/bltWinDraw.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltVecMath.c blt2.4z/src/bltVecMath.c
+--- blt2.4z.orig/src/bltVecMath.c 2002-09-10 01:12:33.000000000 -0400
++++ blt2.4z/src/bltVecMath.c 2013-07-15 11:15:51.000000000 -0400
+@@ -28,6 +28,12 @@
+
+ #include "bltVecInt.h"
+
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
++#define Tcl_GetStringResult(x) x->result
++#define Tcl_GetErrorLine(x) x->errorLine
++#define Tcl_SetResult(x, y, z) x->result = y
++#endif
++
+ /*
+ * Three types of math functions:
+ *
+@@ -764,20 +770,20 @@
+ if ((errno == EDOM) || (value != value)) {
+ Tcl_AppendResult(interp, "domain error: argument not in valid range",
+ (char *)NULL);
+- Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", interp->result,
++ Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", Tcl_GetStringResult(interp),
+ (char *)NULL);
+ } else if ((errno == ERANGE) || IS_INF(value)) {
+ if (value == 0.0) {
+ Tcl_AppendResult(interp,
+ "floating-point value too small to represent",
+ (char *)NULL);
+- Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", interp->result,
++ Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW",
Tcl_GetStringResult(interp),
+ (char *)NULL);
+ } else {
+ Tcl_AppendResult(interp,
+ "floating-point value too large to represent",
+ (char *)NULL);
+- Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", interp->result,
++ Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW",
Tcl_GetStringResult(interp),
+ (char *)NULL);
+ }
+ } else {
+@@ -786,7 +792,7 @@
+ sprintf(buf, "%d", errno);
+ Tcl_AppendResult(interp, "unknown floating-point error, ",
+ "errno = ", buf, (char *)NULL);
+- Tcl_SetErrorCode(interp, "ARITH", "UNKNOWN", interp->result,
++ Tcl_SetErrorCode(interp, "ARITH", "UNKNOWN",
Tcl_GetStringResult(interp),
+ (char *)NULL);
+ }
+ }
+diff -uNr blt2.4z.orig/src/bltWinDraw.c blt2.4z/src/bltWinDraw.c
+--- blt2.4z.orig/src/bltWinDraw.c 2002-09-07 16:38:08.000000000 -0400
++++ blt2.4z/src/bltWinDraw.c 2013-07-15 11:15:51.000000000 -0400
@@ -1647,8 +1647,13 @@
if (drawable == None) {
return;
@@ -3729,9 +3840,9 @@
}
static void
-diff -uNr blt2.4z/src/bltWindow.c blt2.4z.fink/src/bltWindow.c
---- blt2.4z/src/bltWindow.c 2002-09-18 23:02:09.000000000 -0400
-+++ blt2.4z.fink/src/bltWindow.c 2013-02-27 21:58:32.000000000 -0500
+diff -uNr blt2.4z.orig/src/bltWindow.c blt2.4z/src/bltWindow.c
+--- blt2.4z.orig/src/bltWindow.c 2002-09-18 23:02:09.000000000 -0400
++++ blt2.4z/src/bltWindow.c 2013-07-15 11:15:51.000000000 -0400
@@ -89,9 +89,9 @@
typedef struct TkDisplayStruct {
@@ -4183,9 +4294,9 @@
} TkDisplay;
#else
-diff -uNr blt2.4z/src/shared/Makefile.in blt2.4z.fink/src/shared/Makefile.in
---- blt2.4z/src/shared/Makefile.in 2002-05-14 17:37:19.000000000 -0400
-+++ blt2.4z.fink/src/shared/Makefile.in 2013-02-27 21:58:32.000000000
-0500
+diff -uNr blt2.4z.orig/src/shared/Makefile.in blt2.4z/src/shared/Makefile.in
+--- blt2.4z.orig/src/shared/Makefile.in 2002-05-14 17:37:19.000000000
-0400
++++ blt2.4z/src/shared/Makefile.in 2013-07-15 11:15:51.000000000 -0400
@@ -120,8 +120,8 @@
LN_S = @LN_S@
bltwish = bltwish$(version)
@@ -4235,10 +4346,20 @@
# ------------------------------------------------------------------------
# in lieu of viewpath-ing...
-diff -uNr blt2.4z/src/tkButton.c blt2.4z.fink/src/tkButton.c
---- blt2.4z/src/tkButton.c 2002-09-23 03:19:01.000000000 -0400
-+++ blt2.4z.fink/src/tkButton.c 2013-02-27 21:58:32.000000000 -0500
-@@ -1104,7 +1104,7 @@
+diff -uNr blt2.4z.orig/src/tkButton.c blt2.4z/src/tkButton.c
+--- blt2.4z.orig/src/tkButton.c 2002-09-23 03:19:01.000000000 -0400
++++ blt2.4z/src/tkButton.c 2013-07-15 11:18:47.000000000 -0400
+@@ -526,7 +526,9 @@
+ static Blt_TileChangedProc TileChangedProc;
+ static Tcl_CmdProc ButtonCmd, LabelCmd, CheckbuttonCmd, RadiobuttonCmd;
+
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
+ EXTERN int TkCopyAndGlobalEval _ANSI_ARGS_((Tcl_Interp *interp, char
*script));
++#endif
+
+ #if (TK_MAJOR_VERSION > 4)
+ EXTERN void TkComputeAnchor _ANSI_ARGS_((Tk_Anchor anchor, Tk_Window tkwin,
+@@ -1104,7 +1106,7 @@
TCL_GLOBAL_ONLY | TCL_TRACE_WRITES | TCL_TRACE_UNSETS,
ButtonVarProc, (ClientData)butPtr);
}
@@ -4247,9 +4368,46 @@
argc, argv, (char *)butPtr, flags) != TCL_OK) {
return TCL_ERROR;
}
-diff -uNr blt2.4z/win/makedefs blt2.4z.fink/win/makedefs
---- blt2.4z/win/makedefs 2002-10-16 01:33:53.000000000 -0400
-+++ blt2.4z.fink/win/makedefs 2013-02-27 21:58:32.000000000 -0500
+@@ -1890,7 +1892,11 @@
+ }
+ }
+ if ((butPtr->type != TYPE_LABEL) && (butPtr->command != NULL)) {
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
+ return TkCopyAndGlobalEval(butPtr->interp, butPtr->command);
++#else
++ return Tcl_EvalObjEx(butPtr->interp, butPtr->command, TCL_EVAL_GLOBAL);
++#endif
+ }
+ return TCL_OK;
+ }
+diff -uNr blt2.4z.orig/src/tkScrollbar.c blt2.4z/src/tkScrollbar.c
+--- blt2.4z.orig/src/tkScrollbar.c 2002-05-16 16:46:01.000000000 -0400
++++ blt2.4z/src/tkScrollbar.c 2013-07-15 11:15:51.000000000 -0400
+@@ -22,6 +22,12 @@
+
+ #include "bltTile.h"
+
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
++#define Tcl_GetStringResult(x) x->result
++#define Tcl_GetErrorLine(x) x->errorLine
++#define Tcl_SetResult(x, y, z) x->result = y
++#endif
++
+ extern Tk_CustomOption bltTileOption;
+
+ #define NORMAL_BG "#d9d9d9"
+@@ -533,7 +539,7 @@
+ } else {
+ fraction = ((double)pixels / (double)barWidth);
+ }
+- sprintf(interp->result, "%g", fraction);
++ sprintf(Tcl_GetStringResult(interp), "%g", fraction);
+ } else if ((c == 'f') && (strncmp(argv[1], "fraction", length) == 0)) {
+ int x, y, pos, barWidth;
+ double fraction;
+diff -uNr blt2.4z.orig/win/makedefs blt2.4z/win/makedefs
+--- blt2.4z.orig/win/makedefs 2002-10-16 01:33:53.000000000 -0400
++++ blt2.4z/win/makedefs 2013-07-15 11:15:51.000000000 -0400
@@ -3,33 +3,13 @@
v1 = 8.4
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
