From: "Alfredo Tupone" <tupone@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tix/files/, dev-tcltk/tix/
Date: Wed, 18 Jan 2023 11:30:39 +0000 (UTC) [thread overview]
Message-ID: <1674041410.743d2f09e1dd694fe7b0302e730ce74928b513b0.tupone@gentoo> (raw)
commit: 743d2f09e1dd694fe7b0302e730ce74928b513b0
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 11:29:33 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 11:30:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=743d2f09
dev-tcltk/tix: fix incompatible function pointer
Closes: https://bugs.gentoo.org/883269
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-tcltk/tix/files/tix-8.4.3-clang6.patch | 114 +++++++++++++++++++++
.../{tix-8.4.3-r2.ebuild => tix-8.4.3-r3.ebuild} | 3 +-
2 files changed, 116 insertions(+), 1 deletion(-)
diff --git a/dev-tcltk/tix/files/tix-8.4.3-clang6.patch b/dev-tcltk/tix/files/tix-8.4.3-clang6.patch
new file mode 100644
index 000000000000..a33984ddf225
--- /dev/null
+++ b/dev-tcltk/tix/files/tix-8.4.3-clang6.patch
@@ -0,0 +1,114 @@
+--- a/generic/tixDiStyle.c 2023-01-18 12:17:57.150995223 +0100
++++ b/generic/tixDiStyle.c 2023-01-18 12:18:33.855410140 +0100
+@@ -31,7 +31,7 @@
+ static int DItemStyleParseProc _ANSI_ARGS_((ClientData clientData,
+ Tcl_Interp *interp, Tk_Window tkwin,
+ CONST84 char *value,char *widRec, int offset));
+-static char * DItemStylePrintProc _ANSI_ARGS_((
++static const char *DItemStylePrintProc _ANSI_ARGS_((
+ ClientData clientData, Tk_Window tkwin,
+ char *widRec, int offset,
+ Tcl_FreeProc **freeProcPtr));
+@@ -998,7 +998,7 @@
+ return TCL_ERROR;
+ }
+
+-static char *DItemStylePrintProc(clientData, tkwin, widRec,offset, freeProcPtr)
++static const char *DItemStylePrintProc(clientData, tkwin, widRec,offset, freeProcPtr)
+ ClientData clientData;
+ Tk_Window tkwin;
+ char *widRec;
+--- a/generic/tixDItem.c 2023-01-18 12:16:16.448599643 +0100
++++ b/generic/tixDItem.c 2023-01-18 12:16:48.979081490 +0100
+@@ -30,7 +30,7 @@
+ Tcl_Interp *interp, Tk_Window tkwin, CONST84 char *value,
+ char *widRec, int offset));
+
+-static char *DItemPrintProc _ANSI_ARGS_((
++static const char *DItemPrintProc _ANSI_ARGS_((
+ ClientData clientData, Tk_Window tkwin, char *widRec,
+ int offset, Tcl_FreeProc **freeProcPtr));
+
+@@ -548,7 +548,7 @@
+ return TCL_OK;
+ }
+
+-static char *DItemPrintProc(clientData, tkwin, widRec,offset, freeProcPtr)
++static const char *DItemPrintProc(clientData, tkwin, widRec,offset, freeProcPtr)
+ ClientData clientData;
+ Tk_Window tkwin;
+ char *widRec;
+--- a/generic/tixImgCmp.c 2023-01-18 12:19:03.138943264 +0100
++++ b/generic/tixImgCmp.c 2023-01-18 12:21:32.884554265 +0100
+@@ -142,8 +142,8 @@
+ * The type record for bitmap images:
+ */
+ static int ImgCmpCreate _ANSI_ARGS_((Tcl_Interp *interp,
+- char *name, int argc, Tcl_Obj *CONST objv[],
+- Tk_ImageType *typePtr, Tk_ImageMaster master,
++ const char *name, int argc, Tcl_Obj *CONST objv[],
++ const Tk_ImageType *typePtr, Tk_ImageMaster master,
+ ClientData *clientDataPtr));
+ static ClientData ImgCmpGet _ANSI_ARGS_((Tk_Window tkwin,
+ ClientData clientData));
+@@ -378,11 +378,11 @@
+ ImgCmpCreate(interp, name, argc, objv, typePtr, master, clientDataPtr)
+ Tcl_Interp *interp; /* Interpreter for application containing
+ * image. */
+- char *name; /* Name to use for image. */
++ const char *name; /* Name to use for image. */
+ int argc; /* Number of arguments. */
+ Tcl_Obj *CONST objv[]; /* Argument strings for options (doesn't
+ * include image name or type). */
+- Tk_ImageType *typePtr; /* Pointer to our type record (not used). */
++ const Tk_ImageType *typePtr; /* Pointer to our type record (not used). */
+ Tk_ImageMaster master; /* Token for image, to be used by us in
+ * later callbacks. */
+ ClientData *clientDataPtr; /* Store manager's token for image here;
+--- a/generic/tixImgXpm.c 2023-01-18 12:22:25.967706824 +0100
++++ b/generic/tixImgXpm.c 2023-01-18 12:23:05.589074088 +0100
+@@ -22,8 +22,8 @@
+ */
+
+ static int ImgXpmCreate _ANSI_ARGS_((Tcl_Interp *interp,
+- char *name, int argc, Tcl_Obj *CONST objv[],
+- Tk_ImageType *typePtr, Tk_ImageMaster master,
++ const char *name, int argc, Tcl_Obj *CONST objv[],
++ const Tk_ImageType *typePtr, Tk_ImageMaster master,
+ ClientData *clientDataPtr));
+ static ClientData ImgXpmGet _ANSI_ARGS_((Tk_Window tkwin,
+ ClientData clientData));
+@@ -115,11 +115,11 @@
+ ImgXpmCreate(interp, name, argc, objv, typePtr, master, clientDataPtr)
+ Tcl_Interp *interp; /* Interpreter for application containing
+ * image. */
+- char *name; /* Name to use for image. */
++ const char *name; /* Name to use for image. */
+ int argc; /* Number of arguments. */
+ Tcl_Obj *CONST objv[]; /* Argument strings for options (doesn't
+ * include image name or type). */
+- Tk_ImageType *typePtr; /* Pointer to our type record (not used). */
++ const Tk_ImageType *typePtr; /* Pointer to our type record (not used). */
+ Tk_ImageMaster master; /* Token for image, to be used by us in
+ * later callbacks. */
+ ClientData *clientDataPtr; /* Store manager's token for image here;
+--- a/generic/tixUtils.c 2023-01-18 12:14:01.374751235 +0100
++++ b/generic/tixUtils.c 2023-01-18 12:14:36.414192268 +0100
+@@ -24,7 +24,7 @@
+ static int ReliefParseProc(ClientData clientData,
+ Tcl_Interp *interp, Tk_Window tkwin, CONST84 char *value,
+ char *widRec, int offset);
+-static char * ReliefPrintProc(ClientData clientData,
++static const char *ReliefPrintProc(ClientData clientData,
+ Tk_Window tkwin, char *widRec, int offset,
+ Tix_FreeProc **freeProcPtr);
+
+@@ -637,7 +637,7 @@
+ return TCL_ERROR;
+ }
+
+-static char *
++static const char *
+ ReliefPrintProc(clientData, tkwin, widRec,offset, freeProcPtr)
+ ClientData clientData;
+ Tk_Window tkwin;
diff --git a/dev-tcltk/tix/tix-8.4.3-r2.ebuild b/dev-tcltk/tix/tix-8.4.3-r3.ebuild
similarity index 95%
rename from dev-tcltk/tix/tix-8.4.3-r2.ebuild
rename to dev-tcltk/tix/tix-8.4.3-r3.ebuild
index 3eef52a79f09..b1aa7a279451 100644
--- a/dev-tcltk/tix/tix-8.4.3-r2.ebuild
+++ b/dev-tcltk/tix/tix-8.4.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -27,6 +27,7 @@ PATCHES=(
"${FILESDIR}"/${P}-tcl8.5.patch
"${FILESDIR}"/${P}-tcl8.6.patch
"${FILESDIR}"/${P}-wimplicit-int.patch
+ "${FILESDIR}"/${P}-clang6.patch
)
src_prepare() {
next reply other threads:[~2023-01-18 11:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-18 11:30 Alfredo Tupone [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-18 19:14 [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tix/files/, dev-tcltk/tix/ Alfredo Tupone
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1674041410.743d2f09e1dd694fe7b0302e730ce74928b513b0.tupone@gentoo \
--to=tupone@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox