Don't build static with tcl8.6, that doesn't work (yet). Could be fixed, but not high prio.

Add a few "const" specifiers (backported from 8.6)

6 files changed, 7 insertions, 14 deletions

diff --git a/.travis.yml b/.travis.yml
index 5f01fb0..f603442 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,13 +15,6 @@ matrix:
       compiler: gcc
       env:
         - BUILD_DIR=unix
-    - name: "Linux/GCC/Static"
-      os: linux
-      dist: bionic
-      compiler: gcc
-      env:
-        - CFGOPT="--disable-shared"
-        - BUILD_DIR=unix
     - name: "Linux/GCC 7/Shared"
       os: linux
       dist: bionic
diff --git a/generic/tkFont.c b/generic/tkFont.c
index 7ff1ae9..6d01114 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -3201,7 +3201,7 @@ ParseFontNameObj(
 				 * specified in font name are filled with
 				 * default values. */
 {
-    char *dash;
+    const char *dash;
     int objc, result, i, n;
     Tcl_Obj **objv;
     char *string;
diff --git a/generic/tkOption.c b/generic/tkOption.c
index 95b140d..b32b3ef 100644
--- a/generic/tkOption.c
+++ b/generic/tkOption.c
@@ -406,7 +406,7 @@ Tk_GetOption(
 				 * name. */
 {
     Tk_Uid nameId, classId = NULL;
-    char *masqName;
+    const char *masqName;
     register Element *elPtr, *bestPtr;
     register int count;
     StackLevel *levelPtr;
diff --git a/generic/tkStyle.c b/generic/tkStyle.c
index c2eed8f..d37f96d 100644
--- a/generic/tkStyle.c
+++ b/generic/tkStyle.c
@@ -610,7 +610,7 @@ CreateElement(
     Tcl_HashEntry *entryPtr, *engineEntryPtr;
     Tcl_HashSearch search;
     int newEntry, elementId, genericId = -1;
-    char *dot;
+    const char *dot;
     StyleEngine *enginePtr;
 
     /*
@@ -692,7 +692,7 @@ Tk_GetElementId(
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     Tcl_HashEntry *entryPtr;
     int genericId = -1;
-    char *dot;
+    const char *dot;
 
     /*
      * Find the element Id.
diff --git a/macosx/tkMacOSXDebug.c b/macosx/tkMacOSXDebug.c
index 78008f0..fc01ef4 100644
--- a/macosx/tkMacOSXDebug.c
+++ b/macosx/tkMacOSXDebug.c
@@ -64,7 +64,7 @@ TkMacOSXGetNamedDebugSymbol(
 	for (i = 0; i < n; i++) {
 	    if (module && *module) {
 		/* Find image with given module name */
-		char *name;
+		const char *name;
 		const char *path = _dyld_get_image_name(i);
 
 		if (!path) {
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index 897770b..d15b1dd 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.c
@@ -839,7 +839,7 @@ TkpGetFontFamilies(
     Tk_Window tkwin)		/* For display to query. */
 {
     int i, new, numNames;
-    char *family, **nameList;
+    const char *family, **nameList;
     Tcl_HashTable familyTable;
     Tcl_HashEntry *hPtr;
     Tcl_HashSearch search;
@@ -850,7 +850,7 @@ TkpGetFontFamilies(
     Tcl_InitHashTable(&familyTable, TCL_STRING_KEYS);
     nameList = ListFonts(Tk_Display(tkwin), "*", &numNames);
     for (i = 0; i < numNames; i++) {
-	char *familyEnd;
+	const char *familyEnd;
 
 	family = strchr(nameList[i] + 1, '-');
 	if (family == NULL) {