commit: 6e0edcc11d9ba4bed7d06a0203690e366563f75b Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Tue Jan 17 21:16:56 2023 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Tue Jan 17 21:17:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e0edcc1
dev-tcltk/tktable: incompatible function pointer types Closes: https://bugs.gentoo.org/880911 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-tcltk/tktable/files/tktable-2.10-clang6.patch | 80 ++++++++++++++++++++++ ...table-2.10-r1.ebuild => tktable-2.10-r2.ebuild} | 1 + 2 files changed, 81 insertions(+) diff --git a/dev-tcltk/tktable/files/tktable-2.10-clang6.patch b/dev-tcltk/tktable/files/tktable-2.10-clang6.patch new file mode 100644 index 000000000000..af5eea359442 --- /dev/null +++ b/dev-tcltk/tktable/files/tktable-2.10-clang6.patch @@ -0,0 +1,80 @@ +--- a/generic/tkTable.h 2023-01-17 21:57:06.986859146 +0100 ++++ b/generic/tkTable.h 2023-01-17 21:59:18.730802234 +0100 +@@ -526,7 +526,7 @@ + extern int TableOptionBdSet(ClientData clientData, + Tcl_Interp *interp, Tk_Window tkwin, + CONST84 char *value, char *widgRec, int offset); +-extern char * TableOptionBdGet(ClientData clientData, ++extern const char *TableOptionBdGet(ClientData clientData, + Tk_Window tkwin, char *widgRec, int offset, + Tcl_FreeProc **freeProcPtr); + extern int TableTagConfigureBd(Table *tablePtr, +@@ -535,7 +535,7 @@ + Tcl_Interp *interp, + Tk_Window unused, CONST84 char *value, + char *widgRec, int offset); +-extern char * Cmd_OptionGet(ClientData clientData, ++extern const char *Cmd_OptionGet(ClientData clientData, + Tk_Window unused, char *widgRec, + int offset, Tcl_FreeProc **freeProcPtr); + +--- a/generic/tkTableWin.c 2023-01-17 22:09:00.225476183 +0100 ++++ b/generic/tkTableWin.c 2023-01-17 22:02:24.739108283 +0100 +@@ -17,7 +17,7 @@ + static int StickyParseProc _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, Tk_Window tkwin, + CONST84 char *value, char *widgRec, int offset)); +-static char * StickyPrintProc _ANSI_ARGS_((ClientData clientData, ++static const char *StickyPrintProc _ANSI_ARGS_((ClientData clientData, + Tk_Window tkwin, char *widgRec, int offset, + Tcl_FreeProc **freeProcPtr)); + +@@ -117,7 +117,7 @@ + * + *---------------------------------------------------------------------- + */ +-static char * ++static const char * + StickyPrintProc(clientData, tkwin, widgRec, offset, freeProcPtr) + ClientData clientData; /* Ignored. */ + Tk_Window tkwin; /* Window for text widget. */ +--- a/generic/tkTableTag.c 2023-01-17 22:12:25.754449096 +0100 ++++ b/generic/tkTableTag.c 2023-01-17 22:12:49.819092428 +0100 +@@ -22,7 +22,7 @@ + static int TableOptionReliefSet _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, Tk_Window tkwin, + CONST84 char *value, char *widgRec, int offset)); +-static char * TableOptionReliefGet _ANSI_ARGS_((ClientData clientData, ++static const char *TableOptionReliefGet _ANSI_ARGS_((ClientData clientData, + Tk_Window tkwin, char *widgRec, int offset, + Tcl_FreeProc **freeProcPtr)); + +@@ -1340,7 +1340,7 @@ + *---------------------------------------------------------------------- + */ + +-static char * ++static const char * + TableOptionReliefGet(clientData, tkwin, widgRec, offset, freeProcPtr) + ClientData clientData; /* Type of struct being set. */ + Tk_Window tkwin; /* Window containing canvas widget. */ +--- a/generic/tkTableUtil.c 2023-01-17 22:13:28.610516868 +0100 ++++ b/generic/tkTableUtil.c 2023-01-17 22:14:07.003963494 +0100 +@@ -169,7 +169,7 @@ + *---------------------------------------------------------------------- + */ + +-char * ++const char * + TableOptionBdGet(clientData, tkwin, widgRec, offset, freeProcPtr) + ClientData clientData; /* Type of struct being set. */ + Tk_Window tkwin; /* Window containing canvas widget. */ +@@ -329,7 +329,7 @@ + *---------------------------------------------------------------------- + */ + +-char * ++const char * + Cmd_OptionGet(ClientData clientData, Tk_Window unused, + char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) + { diff --git a/dev-tcltk/tktable/tktable-2.10-r1.ebuild b/dev-tcltk/tktable/tktable-2.10-r2.ebuild similarity index 95% rename from dev-tcltk/tktable/tktable-2.10-r1.ebuild rename to dev-tcltk/tktable/tktable-2.10-r2.ebuild index 7fa28703fe02..d2bfcfa012d0 100644 --- a/dev-tcltk/tktable/tktable-2.10-r1.ebuild +++ b/dev-tcltk/tktable/tktable-2.10-r2.ebuild @@ -24,6 +24,7 @@ DOCS=( ChangeLog README.txt release.txt ) PATCHES=( "${FILESDIR}"/${P}-parallelMake.patch + "${FILESDIR}"/${P}-clang6.patch ) src_prepare() {
