* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tix/files/, dev-tcltk/tix/
@ 2023-01-18 11:30 Alfredo Tupone
0 siblings, 0 replies; 2+ messages in thread
From: Alfredo Tupone @ 2023-01-18 11:30 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tix/files/, dev-tcltk/tix/
@ 2023-01-18 19:14 Alfredo Tupone
0 siblings, 0 replies; 2+ messages in thread
From: Alfredo Tupone @ 2023-01-18 19:14 UTC (permalink / raw
To: gentoo-commits
commit: a4ae4ba0d02e3bddad41991715b21fa7e062abd3
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 19:13:53 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 19:14:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ae4ba0
dev-tcltk/tix: do not overwrite user's optimization
Closes: https://bugs.gentoo.org/886993
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-tcltk/tix/files/tix-8.4.3-noopt.patch | 38 ++++++++++++++++++++++
.../{tix-8.4.3-r3.ebuild => tix-8.4.3-r4.ebuild} | 4 +++
2 files changed, 42 insertions(+)
diff --git a/dev-tcltk/tix/files/tix-8.4.3-noopt.patch b/dev-tcltk/tix/files/tix-8.4.3-noopt.patch
new file mode 100644
index 000000000000..14a36374d292
--- /dev/null
+++ b/dev-tcltk/tix/files/tix-8.4.3-noopt.patch
@@ -0,0 +1,38 @@
+--- a/tclconfig/tcl.m4 2023-01-18 20:03:02.719671952 +0100
++++ b/tclconfig/tcl.m4 2023-01-18 20:07:22.110504323 +0100
+@@ -981,9 +981,7 @@
+ ECHO_VERSION='`echo ${PACKAGE_VERSION}`'
+ TCL_LIB_VERSIONS_OK=ok
+ CFLAGS_DEBUG=-g
+- CFLAGS_OPTIMIZE=-O
+ if test "$GCC" = "yes" ; then
+- CFLAGS_OPTIMIZE=-O2
+ CFLAGS_WARNING="-Wall -Wno-implicit-int"
+ else
+ CFLAGS_WARNING=""
+@@ -1445,7 +1443,6 @@
+ SHLIB_LD_LIBS='${LIBS}'
+ SHLIB_SUFFIX=".so"
+
+- CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
+ # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings
+ # when you inline the string and math operations. Turn this off to
+ # get rid of the warnings.
+@@ -3158,17 +3155,6 @@
+ # It makes compiling go faster. (This is only a performance feature.)
+ #------------------------------------------------------------------------
+
+- if test -z "$no_pipe" -a -n "$GCC"; then
+- AC_CACHE_CHECK([if the compiler understands -pipe],
+- tcl_cv_cc_pipe, [
+- hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -pipe"
+- AC_TRY_COMPILE(,, tcl_cv_cc_pipe=yes, tcl_cv_cc_pipe=no)
+- CFLAGS=$hold_cflags])
+- if test $tcl_cv_cc_pipe = yes; then
+- CFLAGS="$CFLAGS -pipe"
+- fi
+- fi
+-
+ #--------------------------------------------------------------------
+ # Common compiler flag setup
+ #--------------------------------------------------------------------
diff --git a/dev-tcltk/tix/tix-8.4.3-r3.ebuild b/dev-tcltk/tix/tix-8.4.3-r4.ebuild
similarity index 95%
rename from dev-tcltk/tix/tix-8.4.3-r3.ebuild
rename to dev-tcltk/tix/tix-8.4.3-r4.ebuild
index b1aa7a279451..8d589a306097 100644
--- a/dev-tcltk/tix/tix-8.4.3-r3.ebuild
+++ b/dev-tcltk/tix/tix-8.4.3-r4.ebuild
@@ -3,6 +3,8 @@
EAPI=8
+inherit autotools
+
MY_P="Tix${PV}"
DESCRIPTION="A widget library for Tcl/Tk"
HOMEPAGE="http://tix.sourceforge.net/"
@@ -28,6 +30,7 @@ PATCHES=(
"${FILESDIR}"/${P}-tcl8.6.patch
"${FILESDIR}"/${P}-wimplicit-int.patch
"${FILESDIR}"/${P}-clang6.patch
+ "${FILESDIR}"/${P}-noopt.patch
)
src_prepare() {
@@ -37,6 +40,7 @@ src_prepare() {
-e 's:-Os::g' \
-i configure tclconfig/tcl.m4 || die
default
+ eautoreconf
}
src_configure() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-18 19:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-18 19:14 [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tix/files/, dev-tcltk/tix/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2023-01-18 11:30 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox