From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-tcltk/blt/files/blt-2.4z-aclocal.patch | 79 -------------------- dev-tcltk/blt/files/blt-2.4z-darwin.patch | 72 ------------------ dev-tcltk/blt/files/blt-2.4z-gbsd.patch | 54 -------------- dev-tcltk/blt/files/blt-2.4z-ldflags.patch | 30 -------- dev-tcltk/blt/files/blt-2.4z-linking.patch | 21 ------ .../blt/files/blt-2.4z-r4-fix-makefile2.patch | 18 ----- .../blt/files/blt-2.4z-r4-fix-makefile3.patch | 14 ---- .../blt/files/blt-2.4z-tcl8.5-fixpkgruntime.patch | 66 ----------------- dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch | 86 ---------------------- dev-tcltk/blt/files/blt-2.4z-tk8.6.patch | 20 ----- dev-tcltk/blt/files/blt2.4z-64bit.patch | 24 ------ 11 files changed, 484 deletions(-) delete mode 100644 dev-tcltk/blt/files/blt-2.4z-aclocal.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-darwin.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-gbsd.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-ldflags.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-linking.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile2.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile3.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-tcl8.5-fixpkgruntime.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch delete mode 100644 dev-tcltk/blt/files/blt-2.4z-tk8.6.patch delete mode 100644 dev-tcltk/blt/files/blt2.4z-64bit.patch (limited to 'dev-tcltk/blt/files') diff --git a/dev-tcltk/blt/files/blt-2.4z-aclocal.patch b/dev-tcltk/blt/files/blt-2.4z-aclocal.patch deleted file mode 100644 index e7c62b5de7f3..000000000000 --- a/dev-tcltk/blt/files/blt-2.4z-aclocal.patch +++ /dev/null @@ -1,79 +0,0 @@ - aclocal.m4 | 6 +++--- - configure.in | 38 +++----------------------------------- - 2 files changed, 6 insertions(+), 38 deletions(-) - -diff --git a/aclocal.m4 b/aclocal.m4 -index 7441d3d..b86a6b2 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -11,11 +11,11 @@ if test "$cross_compiling" = yes; then - else - cat > conftest.$ac_ext <= _VERSION(8,1,0)) - if (Tcl_PkgPresent(interp, "Tk", TK_VERSION, EXACT) == NULL) { - return TCL_OK; -- } -+ } - #else - if (Tcl_PkgRequire(interp, "Tk", TK_VERSION, EXACT) == NULL) { - Tcl_ResetResult(interp); - return TCL_OK; - } - #endif -+#endif -+ - nsPtr = Tcl_CreateNamespace(interp, "blt::tile", NULL, - (Tcl_NamespaceDeleteProc *) NULL); - if (nsPtr == NULL) { -@@ -507,7 +514,7 @@ Blt_Init(interp) - * Check that the versions of Tcl that have been loaded are - * the same ones that BLT was compiled against. - */ -- if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, EXACT) == NULL) { -+ if (Tcl_InitStubs(interp, TCL_VERSION, EXACT) == NULL) { - return TCL_ERROR; - } - /* Set the "blt_version", "blt_patchLevel", and "blt_libPath" Tcl -@@ -543,6 +550,11 @@ Blt_Init(interp) - if (!tkLoaded) { - register Tcl_AppInitProc **p; - -+ if (Tk_InitStubs(interp, TK_VERSION, 1) == NULL) { -+ return TCL_OK; -+ } -+ -+#if 0 - #if (TCL_VERSION_NUMBER >= _VERSION(8,1,0)) - if (Tcl_PkgPresent(interp, "Tk", TK_VERSION, EXACT) == NULL) { - return TCL_OK; -@@ -553,6 +565,8 @@ Blt_Init(interp) - return TCL_OK; - } - #endif -+#endif -+ - /* Initialize the BLT commands that use Tk too. */ - for (p = tkCmds; *p != NULL; p++) { - if ((**p) (interp) != TCL_OK) { diff --git a/dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch b/dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch deleted file mode 100644 index 8721940af2c3..000000000000 --- a/dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch +++ /dev/null @@ -1,86 +0,0 @@ - src/bltScrollbar.c | 2 +- - src/bltTed.c | 6 +++--- - src/bltVecMath.c | 8 ++++---- - 3 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/bltScrollbar.c b/src/bltScrollbar.c -index 69662de..731e37b 100644 ---- a/src/bltScrollbar.c -+++ b/src/bltScrollbar.c -@@ -534,7 +534,7 @@ ScrollbarWidgetCmd(clientData, interp, argc, argv) - } 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 --git a/src/bltTed.c b/src/bltTed.c -index 64c43e8..832ef9c 100644 ---- a/src/bltTed.c -+++ b/src/bltTed.c -@@ -1504,7 +1504,7 @@ EditOp(dataPtr, interp, argc, argv) - 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 +1678,7 @@ SelectOp(dataPtr, interp, argc, argv) - 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 +1751,7 @@ RepOp(dataPtr, interp, argc, argv) - 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 --git a/src/bltVecMath.c b/src/bltVecMath.c -index dc37af8..5117f63 100644 ---- a/src/bltVecMath.c -+++ b/src/bltVecMath.c -@@ -764,20 +764,20 @@ MathError(interp, value) - 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 +786,7 @@ MathError(interp, value) - 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 --git a/dev-tcltk/blt/files/blt-2.4z-tk8.6.patch b/dev-tcltk/blt/files/blt-2.4z-tk8.6.patch deleted file mode 100644 index f956c098138e..000000000000 --- a/dev-tcltk/blt/files/blt-2.4z-tk8.6.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/tkButton.c.orig 2013-01-04 23:24:45.000000000 -0500 -+++ src/tkButton.c 2013-01-04 23:28:29.000000000 -0500 -@@ -526,8 +526,6 @@ - static Blt_TileChangedProc TileChangedProc; - static Tcl_CmdProc ButtonCmd, LabelCmd, CheckbuttonCmd, RadiobuttonCmd; - --EXTERN int TkCopyAndGlobalEval _ANSI_ARGS_((Tcl_Interp *interp, char *script)); -- - #if (TK_MAJOR_VERSION > 4) - EXTERN void TkComputeAnchor _ANSI_ARGS_((Tk_Anchor anchor, Tk_Window tkwin, - int padX, int padY, int innerWidth, int innerHeight, int *xPtr, -@@ -1890,7 +1888,7 @@ - } - } - if ((butPtr->type != TYPE_LABEL) && (butPtr->command != NULL)) { -- return TkCopyAndGlobalEval(butPtr->interp, butPtr->command); -+ return Tcl_EvalObjEx(butPtr->interp, butPtr->command, TCL_EVAL_GLOBAL); - } - return TCL_OK; - } diff --git a/dev-tcltk/blt/files/blt2.4z-64bit.patch b/dev-tcltk/blt/files/blt2.4z-64bit.patch deleted file mode 100644 index 9f1c3c975eef..000000000000 --- a/dev-tcltk/blt/files/blt2.4z-64bit.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- blt2.4z/src/bltTree.c.64bit-fixes 2002-09-29 07:44:12.000000000 +0200 -+++ blt2.4z/src/bltTree.c 2003-07-31 12:22:53.000000000 +0200 -@@ -95,17 +95,16 @@ static Value *TreeNextValue _ANSI_ARGS_( - */ - - #define REBUILD_MULTIPLIER 3 -+#define START_LOGSIZE 5 /* Initial hash table size is 32. */ -+#define MAX_LIST_VALUES 20 /* Convert to hash table when node -+ * value list gets bigger than this -+ * many values. */ - - #if (SIZEOF_VOID_P == 8) - #define RANDOM_INDEX(i) HashOneWord(mask, downshift, i) - #define BITSPERWORD 64 - #else - --#define START_LOGSIZE 5 /* Initial hash table size is 32. */ --#define MAX_LIST_VALUES 20 /* Convert to hash table when node -- * value list gets bigger than this -- * many values. */ -- - /* - * The following macro takes a preliminary integer hash value and - * produces an index into a hash tables bucket list. The idea is -- cgit v1.2.3