pyrox.dev / nixpkgs
lol
fork atom
nixpkgs / pkgs / development / libraries / tix / fix-clang16.patch
at 24.05-pre 215 lines 8.5 kB view raw
Randy Eckenrode tix: fix build with clang 16
30e58da8
1diff -ur a/generic/tixDItem.c b/generic/tixDItem.c 2--- a/generic/tixDItem.c 2004-03-27 19:44:56.000000000 -0700 3+++ b/generic/tixDItem.c 2023-07-11 14:49:51.583894242 -0600 4@@ -30,7 +30,7 @@ 5 Tcl_Interp *interp, Tk_Window tkwin, CONST84 char *value, 6 char *widRec, int offset)); 7 8-static char *DItemPrintProc _ANSI_ARGS_(( 9+static const char *DItemPrintProc _ANSI_ARGS_(( 10 ClientData clientData, Tk_Window tkwin, char *widRec, 11 int offset, Tcl_FreeProc **freeProcPtr)); 12 13@@ -548,7 +548,7 @@ 14 return TCL_OK; 15 } 16 17-static char *DItemPrintProc(clientData, tkwin, widRec,offset, freeProcPtr) 18+static const char *DItemPrintProc(clientData, tkwin, widRec,offset, freeProcPtr) 19 ClientData clientData; 20 Tk_Window tkwin; 21 char *widRec; 22diff -ur a/generic/tixDiStyle.c b/generic/tixDiStyle.c 23--- a/generic/tixDiStyle.c 2004-03-27 19:44:56.000000000 -0700 24+++ b/generic/tixDiStyle.c 2023-07-11 15:02:45.245210252 -0600 25@@ -31,7 +31,7 @@ 26 static int DItemStyleParseProc _ANSI_ARGS_((ClientData clientData, 27 Tcl_Interp *interp, Tk_Window tkwin, 28 CONST84 char *value,char *widRec, int offset)); 29-static char * DItemStylePrintProc _ANSI_ARGS_(( 30+static const char * DItemStylePrintProc _ANSI_ARGS_(( 31 ClientData clientData, Tk_Window tkwin, 32 char *widRec, int offset, 33 Tcl_FreeProc **freeProcPtr)); 34@@ -785,7 +785,7 @@ 35 36 hashPtr = Tcl_CreateHashEntry(&stylePtr->base.items, (char*)iPtr, &isNew); 37 if (!isNew) { 38- panic("DItem is already associated with style"); 39+ Tcl_Panic("DItem is already associated with style"); 40 } else { 41 Tcl_SetHashValue(hashPtr, (char*)iPtr); 42 } 43@@ -801,7 +801,7 @@ 44 45 hashPtr = Tcl_FindHashEntry(&stylePtr->base.items, (char*)iPtr); 46 if (hashPtr == NULL) { 47- panic("DItem is not associated with style"); 48+ Tcl_Panic("DItem is not associated with style"); 49 } 50 Tcl_DeleteHashEntry(hashPtr); 51 stylePtr->base.refCount--; 52@@ -998,7 +998,7 @@ 53 return TCL_ERROR; 54 } 55 56-static char *DItemStylePrintProc(clientData, tkwin, widRec,offset, freeProcPtr) 57+static const char *DItemStylePrintProc(clientData, tkwin, widRec,offset, freeProcPtr) 58 ClientData clientData; 59 Tk_Window tkwin; 60 char *widRec; 61diff -ur a/generic/tixForm.c b/generic/tixForm.c 62--- a/generic/tixForm.c 2004-03-27 19:44:56.000000000 -0700 63+++ b/generic/tixForm.c 2023-07-11 14:53:45.695753419 -0600 64@@ -802,7 +802,7 @@ 65 * Now set all the client's geometry 66 */ 67 if (PlaceAllClients(masterPtr) != TCL_OK) { 68- panic("circular dependency"); 69+ Tcl_Panic("circular dependency"); 70 } 71 72 for (clientPtr = masterPtr->client; clientPtr; clientPtr=clientPtr->next) { 73diff -ur a/generic/tixGrData.c b/generic/tixGrData.c 74--- a/generic/tixGrData.c 2004-03-27 19:44:56.000000000 -0700 75+++ b/generic/tixGrData.c 2023-07-11 14:54:19.644741199 -0600 76@@ -296,7 +296,7 @@ 77 Tcl_DeleteHashEntry(cy); 78 } 79 else { 80- panic("Inconsistent grid dataset: (%d,%d) : %x %x", x, y, cx, cy); 81+ Tcl_Panic("Inconsistent grid dataset: (%d,%d) : %x %x", x, y, cx, cy); 82 } 83 84 return 1; 85diff -ur a/generic/tixGrid.c b/generic/tixGrid.c 86--- a/generic/tixGrid.c 2008-02-27 21:10:43.000000000 -0700 87+++ b/generic/tixGrid.c 2023-07-11 14:53:59.283841038 -0600 88@@ -831,7 +831,7 @@ 89 * All mapped windows should have been unmapped when the 90 * the entries were deleted 91 */ 92- panic("tixGrid: mappedWindows not NULL"); 93+ Tcl_Panic("tixGrid: mappedWindows not NULL"); 94 } 95 96 Tk_FreeOptions(configSpecs, (char *) wPtr, wPtr->dispData.display, 0); 97diff -ur a/generic/tixHList.c b/generic/tixHList.c 98--- a/generic/tixHList.c 2008-02-27 21:05:29.000000000 -0700 99+++ b/generic/tixHList.c 2023-07-11 14:55:20.699375202 -0600 100@@ -2036,7 +2036,7 @@ 101 break; 102 } 103 if (wPtr->headerWin != NULL) { 104- panic("HList: header subwindow deleted illegally\n"); 105+ Tcl_Panic("HList: header subwindow deleted illegally\n"); 106 } 107 #endif 108 break; 109@@ -2117,7 +2117,7 @@ 110 * All mapped windows should have been unmapped when the 111 * the entries were deleted 112 */ 113- panic("tixHList: mappedWindows not NULL"); 114+ Tcl_Panic("tixHList: mappedWindows not NULL"); 115 } 116 if (wPtr->headerWin) { 117 wPtr->headerWin = NULL; 118diff -ur a/generic/tixImgCmp.c b/generic/tixImgCmp.c 119--- a/generic/tixImgCmp.c 2008-02-27 21:05:29.000000000 -0700 120+++ b/generic/tixImgCmp.c 2023-07-11 14:59:16.429640785 -0600 121@@ -142,8 +142,8 @@ 122 * The type record for bitmap images: 123 */ 124 static int ImgCmpCreate _ANSI_ARGS_((Tcl_Interp *interp, 125- char *name, int argc, Tcl_Obj *CONST objv[], 126- Tk_ImageType *typePtr, Tk_ImageMaster master, 127+ const char *name, int argc, Tcl_Obj *CONST objv[], 128+ const Tk_ImageType *typePtr, Tk_ImageMaster master, 129 ClientData *clientDataPtr)); 130 static ClientData ImgCmpGet _ANSI_ARGS_((Tk_Window tkwin, 131 ClientData clientData)); 132@@ -378,11 +378,11 @@ 133 ImgCmpCreate(interp, name, argc, objv, typePtr, master, clientDataPtr) 134 Tcl_Interp *interp; /* Interpreter for application containing 135 * image. */ 136- char *name; /* Name to use for image. */ 137+ const char *name; /* Name to use for image. */ 138 int argc; /* Number of arguments. */ 139 Tcl_Obj *CONST objv[]; /* Argument strings for options (doesn't 140 * include image name or type). */ 141- Tk_ImageType *typePtr; /* Pointer to our type record (not used). */ 142+ const Tk_ImageType *typePtr;/* Pointer to our type record (not used). */ 143 Tk_ImageMaster master; /* Token for image, to be used by us in 144 * later callbacks. */ 145 ClientData *clientDataPtr; /* Store manager's token for image here; 146diff -ur a/generic/tixImgXpm.c b/generic/tixImgXpm.c 147--- a/generic/tixImgXpm.c 2023-07-11 15:01:05.887387236 -0600 148+++ b/generic/tixImgXpm.c 2023-07-11 15:00:37.209042328 -0600 149@@ -22,8 +22,8 @@ 150 */ 151 152 static int ImgXpmCreate _ANSI_ARGS_((Tcl_Interp *interp, 153- char *name, int argc, Tcl_Obj *CONST objv[], 154- Tk_ImageType *typePtr, Tk_ImageMaster master, 155+ const char *name, int argc, Tcl_Obj *CONST objv[], 156+ const Tk_ImageType *typePtr, Tk_ImageMaster master, 157 ClientData *clientDataPtr)); 158 static ClientData ImgXpmGet _ANSI_ARGS_((Tk_Window tkwin, 159 ClientData clientData)); 160@@ -115,11 +115,11 @@ 161 ImgXpmCreate(interp, name, argc, objv, typePtr, master, clientDataPtr) 162 Tcl_Interp *interp; /* Interpreter for application containing 163 * image. */ 164- char *name; /* Name to use for image. */ 165+ const char *name; /* Name to use for image. */ 166 int argc; /* Number of arguments. */ 167 Tcl_Obj *CONST objv[]; /* Argument strings for options (doesn't 168 * include image name or type). */ 169- Tk_ImageType *typePtr; /* Pointer to our type record (not used). */ 170+ const Tk_ImageType *typePtr;/* Pointer to our type record (not used). */ 171 Tk_ImageMaster master; /* Token for image, to be used by us in 172 * later callbacks. */ 173 ClientData *clientDataPtr; /* Store manager's token for image here; 174@@ -1213,7 +1213,7 @@ 175 PixmapMaster *masterPtr = (PixmapMaster *) masterData; 176 177 if (masterPtr->instancePtr != NULL) { 178- panic("tried to delete pixmap image when instances still exist"); 179+ Tcl_Panic("tried to delete pixmap image when instances still exist"); 180 } 181 masterPtr->tkMaster = NULL; 182 if (masterPtr->imageCmd != NULL) { 183diff -ur a/generic/tixTList.c b/generic/tixTList.c 184--- a/generic/tixTList.c 2008-02-27 21:05:29.000000000 -0700 185+++ b/generic/tixTList.c 2023-07-11 14:55:35.960761327 -0600 186@@ -1208,7 +1208,7 @@ 187 sprintf(buff, "%d", i); 188 Tcl_AppendResult(interp, buff, NULL); 189 } else { 190- panic("TList list entry is invalid"); 191+ Tcl_Panic("TList list entry is invalid"); 192 } 193 } else { 194 Tcl_ResetResult(interp); 195diff -ur a/generic/tixUtils.c b/generic/tixUtils.c 196--- a/generic/tixUtils.c 2008-02-27 21:29:17.000000000 -0700 197+++ b/generic/tixUtils.c 2023-07-11 15:01:43.718202631 -0600 198@@ -24,7 +24,7 @@ 199 static int ReliefParseProc(ClientData clientData, 200 Tcl_Interp *interp, Tk_Window tkwin, CONST84 char *value, 201 char *widRec, int offset); 202-static char * ReliefPrintProc(ClientData clientData, 203+static const char * ReliefPrintProc(ClientData clientData, 204 Tk_Window tkwin, char *widRec, int offset, 205 Tix_FreeProc **freeProcPtr); 206 207@@ -637,7 +637,7 @@ 208 return TCL_ERROR; 209 } 210 211-static char * 212+static const char * 213 ReliefPrintProc(clientData, tkwin, widRec,offset, freeProcPtr) 214 ClientData clientData; 215 Tk_Window tkwin;