* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tclx/files/, dev-tcltk/tclx/
@ 2022-11-18 1:24 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-11-18 1:24 UTC (permalink / raw
To: gentoo-commits
commit: 3c2b1c4ef1121bc8fa1a3b18ad3bbb0a22d5e0c1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 01:14:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 01:14:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c2b1c4e
dev-tcltk/tclx: fix configure w/ clang 16
Bug: https://bugs.gentoo.org/881713
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/tclx-8.4.4-configure-clang16-deux.patch | 82 ++++++++++++++++++++++
.../tclx/files/tclx-8.4.4-configure-clang16.patch | 32 +++++++++
.../{tclx-8.4.4.ebuild => tclx-8.4.4-r1.ebuild} | 4 +-
3 files changed, 117 insertions(+), 1 deletion(-)
diff --git a/dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16-deux.patch b/dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16-deux.patch
new file mode 100644
index 000000000000..da4d5c399aee
--- /dev/null
+++ b/dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16-deux.patch
@@ -0,0 +1,82 @@
+https://github.com/flightaware/tclx/pull/15
+
+From a65705e6cba4fe395afbdc8c903b8b819d7e6962 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 18 Nov 2022 01:12:17 +0000
+Subject: [PATCH] Fix configure.ac compatibility with Clang 16
+
+Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by default.
+
+Unfortunately, this can lead to misconfiguration or miscompilation of software as configure
+tests may then return the wrong result.
+
+We also fix -Wstrict-prototypes while here as it's easy to do and it prepares
+us for C23.
+
+For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
+or the (new) c-std-porting mailing list [3].
+
+[0] https://lwn.net/Articles/913505/
+[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+[2] https://wiki.gentoo.org/wiki/Modern_C_porting
+[3] hosted at lists.linux.dev.
+
+Bug: https://bugs.gentoo.org/881713
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.in
++++ b/configure.in
+@@ -193,10 +193,11 @@ WIFEXITED(x); /* Generates compiler error if WIFEXITED uses an int. */
+
+ AC_MSG_CHECKING(checking to see what 'times' returns)
+ AC_TRY_RUN([
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/times.h>
+ #include <unistd.h>
+-main() {
++int main(void) {
+ struct tms cpu;
+ times(&cpu);
+ sleep(2);
+@@ -269,7 +270,8 @@ main() {
+
+ AC_CHECK_FUNC(catgets,
+ [AC_MSG_CHECKING([catclose return value])
+- AC_TRY_COMPILE([#include <nl_types.h>], [
++ AC_TRY_COMPILE([#include <stdlib.h>
++ #include <nl_types.h>], [
+ if (catclose ((nl_catd) 0) == 0) exit (0);],
+ AC_MSG_RESULT(ok), [
+ AC_MSG_RESULT([broken catclose return type])
+--- a/tclconfig/tcl.m4
++++ b/tclconfig/tcl.m4
+@@ -2525,7 +2525,8 @@ AC_DEFUN([TEA_TIME_HANDLER], [
+ # (like convex) have timezone functions, etc.
+ #
+ AC_CACHE_CHECK([long timezone variable], tcl_cv_timezone_long, [
+- AC_TRY_COMPILE([#include <time.h>],
++ AC_TRY_COMPILE([#include <stdlib.h>
++ #include <time.h>],
+ [extern long timezone;
+ timezone += 1;
+ exit (0);],
+@@ -2537,7 +2538,8 @@ AC_DEFUN([TEA_TIME_HANDLER], [
+ # On some systems (eg IRIX 6.2), timezone is a time_t and not a long.
+ #
+ AC_CACHE_CHECK([time_t timezone variable], tcl_cv_timezone_time, [
+- AC_TRY_COMPILE([#include <time.h>],
++ AC_TRY_COMPILE([#include <stdlib.h>
++ #include <time.h>],
+ [extern time_t timezone;
+ timezone += 1;
+ exit (0);],
+@@ -2574,7 +2576,7 @@ AC_DEFUN([TEA_BUGGY_STRTOD], [
+ AC_TRY_RUN([
+ #include <stdlib.h>
+ extern double strtod();
+- int main() {
++ int main(void) {
+ char *infString="Inf", *nanString="NaN", *spaceString=" ";
+ char *term;
+ double value;
+
diff --git a/dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16.patch b/dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16.patch
new file mode 100644
index 000000000000..89f90363246a
--- /dev/null
+++ b/dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16.patch
@@ -0,0 +1,32 @@
+https://github.com/flightaware/tclx/commit/dfd54117ca500c9422ff2e11940219d19cedb906
+https://bugs.gentoo.org/881713
+
+From dfd54117ca500c9422ff2e11940219d19cedb906 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Tue, 23 Jun 2020 22:44:30 -0700
+Subject: [PATCH] Add missing #includes during configure tests
+
+These lead to failures when configuring on macOS on Apple Silicon
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+--- a/configure.in
++++ b/configure.in
+@@ -195,6 +195,7 @@ WIFEXITED(x); /* Generates compiler error if WIFEXITED uses an int. */
+ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <sys/times.h>
++#include <unistd.h>
+ main() {
+ struct tms cpu;
+ times(&cpu);
+--- a/tclconfig/tcl.m4
++++ b/tclconfig/tcl.m4
+@@ -2572,6 +2572,7 @@ AC_DEFUN([TEA_BUGGY_STRTOD], [
+ if test "$tcl_strtod" = 1; then
+ AC_CACHE_CHECK([for Solaris2.4/Tru64 strtod bugs], tcl_cv_strtod_buggy,[
+ AC_TRY_RUN([
++ #include <stdlib.h>
+ extern double strtod();
+ int main() {
+ char *infString="Inf", *nanString="NaN", *spaceString=" ";
+
diff --git a/dev-tcltk/tclx/tclx-8.4.4.ebuild b/dev-tcltk/tclx/tclx-8.4.4-r1.ebuild
similarity index 88%
rename from dev-tcltk/tclx/tclx-8.4.4.ebuild
rename to dev-tcltk/tclx/tclx-8.4.4-r1.ebuild
index b0be6efad919..34d1fe02ea60 100644
--- a/dev-tcltk/tclx/tclx-8.4.4.ebuild
+++ b/dev-tcltk/tclx/tclx-8.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,6 +22,8 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-8.4-varinit.patch
"${FILESDIR}"/${PN}-8.4-ldflags.patch
+ "${FILESDIR}"/${P}-configure-clang16.patch
+ "${FILESDIR}"/${P}-configure-clang16-deux.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tclx/files/, dev-tcltk/tclx/
@ 2023-03-15 19:43 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2023-03-15 19:43 UTC (permalink / raw
To: gentoo-commits
commit: 3469ff9b4feb523eadf7aa5e0cbbc8d66b8811ed
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 19:42:20 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Mar 15 19:42:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3469ff9b
dev-tcltk/tclx: silence gcc11 warnings
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-tcltk/tclx/files/tclx-8.4.4-gcc11.patch | 192 +++++++++++++++++++++
.../{tclx-8.4.4-r2.ebuild => tclx-8.4.4-r3.ebuild} | 3 +-
2 files changed, 194 insertions(+), 1 deletion(-)
diff --git a/dev-tcltk/tclx/files/tclx-8.4.4-gcc11.patch b/dev-tcltk/tclx/files/tclx-8.4.4-gcc11.patch
new file mode 100644
index 000000000000..6af41afd3ce3
--- /dev/null
+++ b/dev-tcltk/tclx/files/tclx-8.4.4-gcc11.patch
@@ -0,0 +1,192 @@
+--- a/generic/tclXfcntl.c 2023-03-15 19:34:15.074669138 +0100
++++ b/generic/tclXfcntl.c 2023-03-15 19:33:20.805545639 +0100
+@@ -200,8 +200,12 @@
+ value = (optValue == TCLX_BUFFERING_LINE);
+ break;
+ case ATTR_KEEPALIVE:
+- if (TclXOSgetsockopt (interp, channel, SO_KEEPALIVE, &value) != TCL_OK)
++ {
++ socklen_t len;
++ if (TclXOSgetsockopt (interp, channel, SO_KEEPALIVE, &len) != TCL_OK)
+ return TCL_ERROR;
++ value = len;
++ }
+ break;
+ default:
+ panic ("bug in fcntl get attrib");
+--- a/generic/tclXhandles.c 2023-03-15 19:36:33.992425688 +0100
++++ b/generic/tclXhandles.c 2023-03-15 19:43:05.552120448 +0100
+@@ -20,6 +20,9 @@
+
+ #include "tclExtdInt.h"
+
++#include <stdint.h>
++#include <inttypes.h>
++
+ /*
+ * Variable set to contain the alignment factor (in bytes) for this machine.
+ * It is set on the first table initialization.
+@@ -539,7 +542,7 @@
+
+ entryHdrPtr = HEADER_AREA (entryPtr);
+ if (entryHdrPtr->freeLink != ALLOCATED_IDX)
+- panic ("Tcl_HandleFree: entry not allocated %x\n", entryHdrPtr);
++ panic ("Tcl_HandleFree: entry not allocated %" PRIxPTR "\n", (intptr_t)entryHdrPtr);
+
+ entryHdrPtr->freeLink = tblHdrPtr->freeHeadIdx;
+ tblHdrPtr->freeHeadIdx =
+--- a/generic/tclXkeylist.c 2023-03-15 20:02:16.177763876 +0100
++++ b/generic/tclXkeylist.c 2023-03-15 20:04:46.029420986 +0100
+@@ -17,6 +17,7 @@
+ */
+
+ #include "tclExtdInt.h"
++#include <stdint.h>
+
+ /*
+ * Keyed lists are stored as arrays recursively defined objects. The data
+@@ -338,7 +339,7 @@
+ if (keylIntPtr->hashTbl != NULL) {
+ Tcl_HashEntry *entryPtr;
+ Tcl_HashSearch search;
+- int nidx;
++ intptr_t nidx;
+
+ entryPtr = Tcl_FindHashEntry(keylIntPtr->hashTbl,
+ keylIntPtr->entries [entryIdx].key);
+@@ -354,7 +355,7 @@
+ */
+ for (entryPtr = Tcl_FirstHashEntry(keylIntPtr->hashTbl, &search);
+ entryPtr != NULL; entryPtr = Tcl_NextHashEntry(&search)) {
+- nidx = (int) Tcl_GetHashValue(entryPtr);
++ nidx = (intptr_t) Tcl_GetHashValue(entryPtr);
+ if (nidx > entryIdx) {
+ Tcl_SetHashValue(entryPtr, (ClientData) (uintptr_t) (nidx - 1));
+ }
+@@ -394,7 +395,8 @@
+ char **nextSubKeyPtr)
+ {
+ char *keySeparPtr;
+- int keyLen, findIdx = -1;
++ int keyLen;
++ intptr_t findIdx = -1;
+
+ keySeparPtr = strchr (key, '.');
+ if (keySeparPtr != NULL) {
+@@ -416,7 +418,7 @@
+ }
+ entryPtr = Tcl_FindHashEntry(keylIntPtr->hashTbl, key);
+ if (entryPtr != NULL) {
+- findIdx = (int) Tcl_GetHashValue(entryPtr);
++ findIdx = (intptr_t) Tcl_GetHashValue(entryPtr);
+ }
+ if (keySeparPtr != NULL) {
+ key[keyLen] = tmp;
+--- a/generic/tclXsignal.c 2023-03-15 20:07:18.687031905 +0100
++++ b/generic/tclXsignal.c 2023-03-15 20:07:55.997447649 +0100
+@@ -463,7 +463,7 @@
+ *-----------------------------------------------------------------------------
+ */
+ static int
+-BlockSignals (Tcl_Interp *interp, int action, unsigned char signals[])
++BlockSignals (Tcl_Interp *interp, int action, unsigned char signals[MAXSIG])
+ {
+ #ifndef NO_SIGACTION
+ int signalNum;
+--- a/unix/tclXunixDup.c 2023-03-15 20:09:58.482528699 +0100
++++ b/unix/tclXunixDup.c 2023-03-15 20:13:22.981321777 +0100
+@@ -17,6 +17,7 @@
+ */
+
+ #include "tclExtdInt.h"
++#include <stdint.h>
+
+ \f
+ /*-----------------------------------------------------------------------------
+@@ -75,7 +76,8 @@
+ ClientData handle;
+ const Tcl_ChannelType *channelType;
+ Tcl_Channel newChannel = NULL;
+- int srcFileNum, newFileNum = -1;
++ intptr_t srcFileNum;
++ int newFileNum = -1;
+
+ /*
+ * On Unix, the channels we can dup share the same file for the read and
+@@ -86,7 +88,7 @@
+ } else {
+ Tcl_GetChannelHandle (srcChannel, TCL_WRITABLE, &handle);
+ }
+- srcFileNum = (int) handle;
++ srcFileNum = (intptr_t) handle;
+ channelType = Tcl_GetChannelType (srcChannel);
+
+ /*
+--- a/unix/tclXunixId.c 2023-03-15 20:14:58.037829847 +0100
++++ b/unix/tclXunixId.c 2023-03-15 20:15:50.699002979 +0100
+@@ -444,7 +444,7 @@
+ #endif
+ char hostNameBuf[MAXHOSTNAMELEN];
+
+- if (objc != 2)
++ if (objc != 2)
+ return TclX_WrongArgs (interp, objv [0], "host");
+
+ if (gethostname (hostNameBuf, MAXHOSTNAMELEN) < 0) {
+--- a/unix/tclXunixOS.c 2023-03-15 20:16:27.021432520 +0100
++++ b/unix/tclXunixOS.c 2023-03-15 20:25:12.202242082 +0100
+@@ -23,6 +23,7 @@
+
+ #include "tclExtdInt.h"
+
++#include <stdint.h>
+ #ifndef NO_GETPRIORITY
+ #include <sys/resource.h>
+ #endif
+@@ -113,7 +114,7 @@
+ return -1;
+ }
+ }
+- return (int) handle;
++ return (intptr_t) handle;
+ }
+ \f
+ /*-----------------------------------------------------------------------------
+@@ -401,7 +402,7 @@
+ if (pid == 0) {
+ close (errPipes [0]);
+ execl ("/bin/sh", "sh", "-c", command, (char *) NULL);
+- write (errPipes [1], &errno, sizeof (errno));
++ if(write (errPipes [1], &errno, sizeof (errno))) {};
+ _exit (127);
+ }
+
+@@ -918,8 +919,9 @@
+ int
+ TclXOSgetsockname (Tcl_Interp *interp, Tcl_Channel channel, void *sockaddr, int sockaddrSize)
+ {
++ socklen_t siz = sockaddrSize;
+ if (getsockname (ChannelToFnum (channel, 0),
+- (struct sockaddr *) sockaddr, &sockaddrSize) < 0) {
++ (struct sockaddr *) sockaddr, &siz) < 0) {
+ TclX_AppendObjResult (interp, Tcl_GetChannelName (channel), ": ",
+ Tcl_PosixError (interp), (char *) NULL);
+ return TCL_ERROR;
+@@ -943,7 +945,7 @@
+ int
+ TclXOSgetsockopt (Tcl_Interp *interp, Tcl_Channel channel, int option, socklen_t *valuePtr)
+ {
+- int valueLen = sizeof (*valuePtr);
++ socklen_t valueLen = sizeof (*valuePtr);
+
+ if (getsockopt (ChannelToFnum (channel, 0), SOL_SOCKET, option,
+ (void*) valuePtr, &valueLen) != 0) {
+@@ -1385,7 +1387,7 @@
+ (char *) NULL);
+ return TCL_ERROR;
+ }
+- *fnumPtr = (int) handle;
++ *fnumPtr = (intptr_t) handle;
+ return TCL_OK;
+ }
+ \f
diff --git a/dev-tcltk/tclx/tclx-8.4.4-r2.ebuild b/dev-tcltk/tclx/tclx-8.4.4-r3.ebuild
similarity index 96%
rename from dev-tcltk/tclx/tclx-8.4.4-r2.ebuild
rename to dev-tcltk/tclx/tclx-8.4.4-r3.ebuild
index 38ea1746b9a3..77d88925c305 100644
--- a/dev-tcltk/tclx/tclx-8.4.4-r2.ebuild
+++ b/dev-tcltk/tclx/tclx-8.4.4-r3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools
@@ -26,6 +26,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-8.4-ldflags.patch
"${FILESDIR}"/${P}-configure-clang16.patch
"${FILESDIR}"/${P}-configure-clang16-deux.patch
+ "${FILESDIR}"/${P}-gcc11.patch
)
QA_CONFIG_IMPL_DECL_SKIP=(
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tclx/files/, dev-tcltk/tclx/
@ 2023-03-15 21:12 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2023-03-15 21:12 UTC (permalink / raw
To: gentoo-commits
commit: 281535f88931fec48c2dd2fa3a8f4f3cfac201b0
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 21:11:27 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Mar 15 21:12:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=281535f8
dev-tcltk/tclx: filter rresvport if not present
Closes: https://bugs.gentoo.org/894176
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-tcltk/tclx/files/tclx-8.4.4-musl.patch | 25 ++++++++++++++++++++++
.../{tclx-8.4.4-r3.ebuild => tclx-8.4.4-r4.ebuild} | 1 +
2 files changed, 26 insertions(+)
diff --git a/dev-tcltk/tclx/files/tclx-8.4.4-musl.patch b/dev-tcltk/tclx/files/tclx-8.4.4-musl.patch
new file mode 100644
index 000000000000..2fc45e05b6ab
--- /dev/null
+++ b/dev-tcltk/tclx/files/tclx-8.4.4-musl.patch
@@ -0,0 +1,25 @@
+--- a/configure.in 2023-03-15 22:00:11.725506240 +0100
++++ b/configure.in 2023-03-15 22:00:29.230246904 +0100
+@@ -253,6 +253,7 @@
+
+ AC_CHECK_FUNC(inet_aton, , [AC_DEFINE(NO_INET_ATON)])
+ AC_CHECK_FUNC(gethostname, , [AC_DEFINE(NO_GETHOSTNAME)])
++ AC_CHECK_FUNCS([rresvport])
+
+ #-------------------------------------------------------------------------
+ # Check for additional libraries the Tcl/Tk does not check for.
+--- a/unix/tclXunixSock.c 2023-03-15 22:02:32.255424538 +0100
++++ b/unix/tclXunixSock.c 2023-03-15 22:03:35.094493443 +0100
+@@ -194,10 +194,12 @@
+ * Allocate a reserved port if requested.
+ */
+ if (getReserved) {
++#ifdef HAVE_RRESVPORT
+ int port;
+ if (rresvport (&port) < 0)
+ goto unixError;
+ local.sin_port = port;
++#endif
+ }
+
+ /*
diff --git a/dev-tcltk/tclx/tclx-8.4.4-r3.ebuild b/dev-tcltk/tclx/tclx-8.4.4-r4.ebuild
similarity index 97%
rename from dev-tcltk/tclx/tclx-8.4.4-r3.ebuild
rename to dev-tcltk/tclx/tclx-8.4.4-r4.ebuild
index 77d88925c305..ac35e033b305 100644
--- a/dev-tcltk/tclx/tclx-8.4.4-r3.ebuild
+++ b/dev-tcltk/tclx/tclx-8.4.4-r4.ebuild
@@ -27,6 +27,7 @@ PATCHES=(
"${FILESDIR}"/${P}-configure-clang16.patch
"${FILESDIR}"/${P}-configure-clang16-deux.patch
"${FILESDIR}"/${P}-gcc11.patch
+ "${FILESDIR}"/${P}-musl.patch
)
QA_CONFIG_IMPL_DECL_SKIP=(
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tclx/files/, dev-tcltk/tclx/
@ 2023-05-27 10:54 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-05-27 10:54 UTC (permalink / raw
To: gentoo-commits
commit: 99978aef91ce40c35a94f4286f4309f0f236e32b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 10:53:21 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 27 10:53:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99978aef
dev-tcltk/tclx: add 8.6.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-tcltk/tclx/Manifest | 1 +
dev-tcltk/tclx/files/tclx-8.4.4-musl.patch | 1 +
dev-tcltk/tclx/tclx-8.6.1.ebuild | 60 ++++++++++++++++++++++++++++++
3 files changed, 62 insertions(+)
diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
index dc4959ca2a22..b3aecab75124 100644
--- a/dev-tcltk/tclx/Manifest
+++ b/dev-tcltk/tclx/Manifest
@@ -1 +1,2 @@
DIST tclx-8.4.4.tar.gz 456569 BLAKE2B 50123f95ed780c28dae9e2f0db956b81b559ee9ea33563b999f33a727c451374a63c0cba3012d4dd46df020426c7fdb3b04f932fc5b6ec742156e9dad81a7d3b SHA512 dcf9cbd08eae0cc4901e8e871a440e6c85d7d5ac923306206afaf0a1d931866ce3b91177d7b3a37e87a5cdcccb068ed7b9c76cb1a71a13f4f26cf204b8c42090
+DIST tclx-8.6.1.tar.gz 457438 BLAKE2B 451b90a6f4403177604684a2a4475a057924faa4b625ac035d65b622b69e8dfea7146143056491ce8740374c18c4fbfb0184a0d074bf799897a01bb767e1695c SHA512 4a2293aad667b108f19f837686044fc168831781d04a9f8eaa2afe677c587f1e128a536ad9db609720e0046a20ff6f8dd7a0e5dd1232ef775c5a14e24ec0614d
diff --git a/dev-tcltk/tclx/files/tclx-8.4.4-musl.patch b/dev-tcltk/tclx/files/tclx-8.4.4-musl.patch
index 2fc45e05b6ab..301ad263b558 100644
--- a/dev-tcltk/tclx/files/tclx-8.4.4-musl.patch
+++ b/dev-tcltk/tclx/files/tclx-8.4.4-musl.patch
@@ -1,3 +1,4 @@
+https://github.com/flightaware/tclx/pull/16#issuecomment-1565348180
--- a/configure.in 2023-03-15 22:00:11.725506240 +0100
+++ b/configure.in 2023-03-15 22:00:29.230246904 +0100
@@ -253,6 +253,7 @@
diff --git a/dev-tcltk/tclx/tclx-8.6.1.ebuild b/dev-tcltk/tclx/tclx-8.6.1.ebuild
new file mode 100644
index 000000000000..ec341dace231
--- /dev/null
+++ b/dev-tcltk/tclx/tclx-8.6.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A set of extensions to TCL"
+HOMEPAGE="http://tclx.sourceforge.net"
+SRC_URI="https://github.com/flightaware/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="threads"
+
+DEPEND="dev-lang/tcl:0="
+RDEPEND="${DEPEND}"
+
+# tests broken, bug #279283
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.4-varinit.patch
+ "${FILESDIR}"/${PN}-8.4-ldflags.patch
+ "${FILESDIR}"/${PN}-8.4.4-musl.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ stat64 # used to test for Large File Support
+)
+
+src_prepare() {
+ default
+
+ sed \
+ -e '/CC=/s:-pipe::g' \
+ -i tclconfig/tcl.m4 configure || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable threads) \
+ --enable-shared \
+ --with-tcl="${EPREFIX}/usr/$(get_libdir)/"
+
+ # adjust install_name on darwin
+ if [[ ${CHOST} == *-darwin* ]]; then
+ sed -i \
+ -e 's:^\(SHLIB_LD\W.*\)$:\1 -install_name ${pkglibdir}/$@:' \
+ "${S}"/Makefile || die 'sed failed'
+ fi
+}
+
+src_install() {
+ default
+ doman doc/*.[n3]
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tclx/files/, dev-tcltk/tclx/
@ 2024-02-27 7:14 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2024-02-27 7:14 UTC (permalink / raw
To: gentoo-commits
commit: 6795d1df8c3dfd87f090518b4e5b96093b70bada
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 07:13:33 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 07:13:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6795d1df
dev-tcltk/tclx: add 8.6.3, drop 8.4.4-r4
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-tcltk/tclx/Manifest | 2 +-
.../files/tclx-8.4.4-configure-clang16-deux.patch | 83 ---------
.../tclx/files/tclx-8.4.4-configure-clang16.patch | 33 ----
dev-tcltk/tclx/files/tclx-8.4.4-gcc11.patch | 192 ---------------------
.../{tclx-8.4.4-r4.ebuild => tclx-8.6.3.ebuild} | 15 +-
5 files changed, 7 insertions(+), 318 deletions(-)
diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
index b3aecab75124..eca9e2452738 100644
--- a/dev-tcltk/tclx/Manifest
+++ b/dev-tcltk/tclx/Manifest
@@ -1,2 +1,2 @@
-DIST tclx-8.4.4.tar.gz 456569 BLAKE2B 50123f95ed780c28dae9e2f0db956b81b559ee9ea33563b999f33a727c451374a63c0cba3012d4dd46df020426c7fdb3b04f932fc5b6ec742156e9dad81a7d3b SHA512 dcf9cbd08eae0cc4901e8e871a440e6c85d7d5ac923306206afaf0a1d931866ce3b91177d7b3a37e87a5cdcccb068ed7b9c76cb1a71a13f4f26cf204b8c42090
DIST tclx-8.6.1.tar.gz 457438 BLAKE2B 451b90a6f4403177604684a2a4475a057924faa4b625ac035d65b622b69e8dfea7146143056491ce8740374c18c4fbfb0184a0d074bf799897a01bb767e1695c SHA512 4a2293aad667b108f19f837686044fc168831781d04a9f8eaa2afe677c587f1e128a536ad9db609720e0046a20ff6f8dd7a0e5dd1232ef775c5a14e24ec0614d
+DIST tclx-8.6.3.tar.gz 457293 BLAKE2B 4d3578c0312bc2a0a0cfe079699893818ed6bce941dd84d4cb4786891e784930e0172c4c15892a2b81acf0f4a5062145e9f4397842185358b49658c692cd08cc SHA512 680b8916ccb5725ed173b45549c94e7b1e17c4e5cf700c3991d2791b9f299660e94c880401dccfbff7ca630036c0781c41a9692c2d8ead2e7ad880e2e05a69e7
diff --git a/dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16-deux.patch b/dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16-deux.patch
deleted file mode 100644
index 278dc23bb94d..000000000000
--- a/dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16-deux.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-https://github.com/flightaware/tclx/pull/15
-https://sourceforge.net/p/tclx/bugs/84/
-
-From a65705e6cba4fe395afbdc8c903b8b819d7e6962 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 18 Nov 2022 01:12:17 +0000
-Subject: [PATCH] Fix configure.ac compatibility with Clang 16
-
-Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by default.
-
-Unfortunately, this can lead to misconfiguration or miscompilation of software as configure
-tests may then return the wrong result.
-
-We also fix -Wstrict-prototypes while here as it's easy to do and it prepares
-us for C23.
-
-For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
-or the (new) c-std-porting mailing list [3].
-
-[0] https://lwn.net/Articles/913505/
-[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
-[2] https://wiki.gentoo.org/wiki/Modern_C_porting
-[3] hosted at lists.linux.dev.
-
-Bug: https://bugs.gentoo.org/881713
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.in
-+++ b/configure.in
-@@ -193,10 +193,11 @@ WIFEXITED(x); /* Generates compiler error if WIFEXITED uses an int. */
-
- AC_MSG_CHECKING(checking to see what 'times' returns)
- AC_TRY_RUN([
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/times.h>
- #include <unistd.h>
--main() {
-+int main(void) {
- struct tms cpu;
- times(&cpu);
- sleep(2);
-@@ -269,7 +270,8 @@ main() {
-
- AC_CHECK_FUNC(catgets,
- [AC_MSG_CHECKING([catclose return value])
-- AC_TRY_COMPILE([#include <nl_types.h>], [
-+ AC_TRY_COMPILE([#include <stdlib.h>
-+ #include <nl_types.h>], [
- if (catclose ((nl_catd) 0) == 0) exit (0);],
- AC_MSG_RESULT(ok), [
- AC_MSG_RESULT([broken catclose return type])
---- a/tclconfig/tcl.m4
-+++ b/tclconfig/tcl.m4
-@@ -2525,7 +2525,8 @@ AC_DEFUN([TEA_TIME_HANDLER], [
- # (like convex) have timezone functions, etc.
- #
- AC_CACHE_CHECK([long timezone variable], tcl_cv_timezone_long, [
-- AC_TRY_COMPILE([#include <time.h>],
-+ AC_TRY_COMPILE([#include <stdlib.h>
-+ #include <time.h>],
- [extern long timezone;
- timezone += 1;
- exit (0);],
-@@ -2537,7 +2538,8 @@ AC_DEFUN([TEA_TIME_HANDLER], [
- # On some systems (eg IRIX 6.2), timezone is a time_t and not a long.
- #
- AC_CACHE_CHECK([time_t timezone variable], tcl_cv_timezone_time, [
-- AC_TRY_COMPILE([#include <time.h>],
-+ AC_TRY_COMPILE([#include <stdlib.h>
-+ #include <time.h>],
- [extern time_t timezone;
- timezone += 1;
- exit (0);],
-@@ -2574,7 +2576,7 @@ AC_DEFUN([TEA_BUGGY_STRTOD], [
- AC_TRY_RUN([
- #include <stdlib.h>
- extern double strtod();
-- int main() {
-+ int main(void) {
- char *infString="Inf", *nanString="NaN", *spaceString=" ";
- char *term;
- double value;
-
diff --git a/dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16.patch b/dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16.patch
deleted file mode 100644
index 3e135c0c4fcc..000000000000
--- a/dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/flightaware/tclx/commit/dfd54117ca500c9422ff2e11940219d19cedb906
-https://bugs.gentoo.org/881713
-https://sourceforge.net/p/tclx/bugs/84/
-
-From dfd54117ca500c9422ff2e11940219d19cedb906 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 23 Jun 2020 22:44:30 -0700
-Subject: [PATCH] Add missing #includes during configure tests
-
-These lead to failures when configuring on macOS on Apple Silicon
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---- a/configure.in
-+++ b/configure.in
-@@ -195,6 +195,7 @@ WIFEXITED(x); /* Generates compiler error if WIFEXITED uses an int. */
- AC_TRY_RUN([
- #include <sys/types.h>
- #include <sys/times.h>
-+#include <unistd.h>
- main() {
- struct tms cpu;
- times(&cpu);
---- a/tclconfig/tcl.m4
-+++ b/tclconfig/tcl.m4
-@@ -2572,6 +2572,7 @@ AC_DEFUN([TEA_BUGGY_STRTOD], [
- if test "$tcl_strtod" = 1; then
- AC_CACHE_CHECK([for Solaris2.4/Tru64 strtod bugs], tcl_cv_strtod_buggy,[
- AC_TRY_RUN([
-+ #include <stdlib.h>
- extern double strtod();
- int main() {
- char *infString="Inf", *nanString="NaN", *spaceString=" ";
-
diff --git a/dev-tcltk/tclx/files/tclx-8.4.4-gcc11.patch b/dev-tcltk/tclx/files/tclx-8.4.4-gcc11.patch
deleted file mode 100644
index 6af41afd3ce3..000000000000
--- a/dev-tcltk/tclx/files/tclx-8.4.4-gcc11.patch
+++ /dev/null
@@ -1,192 +0,0 @@
---- a/generic/tclXfcntl.c 2023-03-15 19:34:15.074669138 +0100
-+++ b/generic/tclXfcntl.c 2023-03-15 19:33:20.805545639 +0100
-@@ -200,8 +200,12 @@
- value = (optValue == TCLX_BUFFERING_LINE);
- break;
- case ATTR_KEEPALIVE:
-- if (TclXOSgetsockopt (interp, channel, SO_KEEPALIVE, &value) != TCL_OK)
-+ {
-+ socklen_t len;
-+ if (TclXOSgetsockopt (interp, channel, SO_KEEPALIVE, &len) != TCL_OK)
- return TCL_ERROR;
-+ value = len;
-+ }
- break;
- default:
- panic ("bug in fcntl get attrib");
---- a/generic/tclXhandles.c 2023-03-15 19:36:33.992425688 +0100
-+++ b/generic/tclXhandles.c 2023-03-15 19:43:05.552120448 +0100
-@@ -20,6 +20,9 @@
-
- #include "tclExtdInt.h"
-
-+#include <stdint.h>
-+#include <inttypes.h>
-+
- /*
- * Variable set to contain the alignment factor (in bytes) for this machine.
- * It is set on the first table initialization.
-@@ -539,7 +542,7 @@
-
- entryHdrPtr = HEADER_AREA (entryPtr);
- if (entryHdrPtr->freeLink != ALLOCATED_IDX)
-- panic ("Tcl_HandleFree: entry not allocated %x\n", entryHdrPtr);
-+ panic ("Tcl_HandleFree: entry not allocated %" PRIxPTR "\n", (intptr_t)entryHdrPtr);
-
- entryHdrPtr->freeLink = tblHdrPtr->freeHeadIdx;
- tblHdrPtr->freeHeadIdx =
---- a/generic/tclXkeylist.c 2023-03-15 20:02:16.177763876 +0100
-+++ b/generic/tclXkeylist.c 2023-03-15 20:04:46.029420986 +0100
-@@ -17,6 +17,7 @@
- */
-
- #include "tclExtdInt.h"
-+#include <stdint.h>
-
- /*
- * Keyed lists are stored as arrays recursively defined objects. The data
-@@ -338,7 +339,7 @@
- if (keylIntPtr->hashTbl != NULL) {
- Tcl_HashEntry *entryPtr;
- Tcl_HashSearch search;
-- int nidx;
-+ intptr_t nidx;
-
- entryPtr = Tcl_FindHashEntry(keylIntPtr->hashTbl,
- keylIntPtr->entries [entryIdx].key);
-@@ -354,7 +355,7 @@
- */
- for (entryPtr = Tcl_FirstHashEntry(keylIntPtr->hashTbl, &search);
- entryPtr != NULL; entryPtr = Tcl_NextHashEntry(&search)) {
-- nidx = (int) Tcl_GetHashValue(entryPtr);
-+ nidx = (intptr_t) Tcl_GetHashValue(entryPtr);
- if (nidx > entryIdx) {
- Tcl_SetHashValue(entryPtr, (ClientData) (uintptr_t) (nidx - 1));
- }
-@@ -394,7 +395,8 @@
- char **nextSubKeyPtr)
- {
- char *keySeparPtr;
-- int keyLen, findIdx = -1;
-+ int keyLen;
-+ intptr_t findIdx = -1;
-
- keySeparPtr = strchr (key, '.');
- if (keySeparPtr != NULL) {
-@@ -416,7 +418,7 @@
- }
- entryPtr = Tcl_FindHashEntry(keylIntPtr->hashTbl, key);
- if (entryPtr != NULL) {
-- findIdx = (int) Tcl_GetHashValue(entryPtr);
-+ findIdx = (intptr_t) Tcl_GetHashValue(entryPtr);
- }
- if (keySeparPtr != NULL) {
- key[keyLen] = tmp;
---- a/generic/tclXsignal.c 2023-03-15 20:07:18.687031905 +0100
-+++ b/generic/tclXsignal.c 2023-03-15 20:07:55.997447649 +0100
-@@ -463,7 +463,7 @@
- *-----------------------------------------------------------------------------
- */
- static int
--BlockSignals (Tcl_Interp *interp, int action, unsigned char signals[])
-+BlockSignals (Tcl_Interp *interp, int action, unsigned char signals[MAXSIG])
- {
- #ifndef NO_SIGACTION
- int signalNum;
---- a/unix/tclXunixDup.c 2023-03-15 20:09:58.482528699 +0100
-+++ b/unix/tclXunixDup.c 2023-03-15 20:13:22.981321777 +0100
-@@ -17,6 +17,7 @@
- */
-
- #include "tclExtdInt.h"
-+#include <stdint.h>
-
- \f
- /*-----------------------------------------------------------------------------
-@@ -75,7 +76,8 @@
- ClientData handle;
- const Tcl_ChannelType *channelType;
- Tcl_Channel newChannel = NULL;
-- int srcFileNum, newFileNum = -1;
-+ intptr_t srcFileNum;
-+ int newFileNum = -1;
-
- /*
- * On Unix, the channels we can dup share the same file for the read and
-@@ -86,7 +88,7 @@
- } else {
- Tcl_GetChannelHandle (srcChannel, TCL_WRITABLE, &handle);
- }
-- srcFileNum = (int) handle;
-+ srcFileNum = (intptr_t) handle;
- channelType = Tcl_GetChannelType (srcChannel);
-
- /*
---- a/unix/tclXunixId.c 2023-03-15 20:14:58.037829847 +0100
-+++ b/unix/tclXunixId.c 2023-03-15 20:15:50.699002979 +0100
-@@ -444,7 +444,7 @@
- #endif
- char hostNameBuf[MAXHOSTNAMELEN];
-
-- if (objc != 2)
-+ if (objc != 2)
- return TclX_WrongArgs (interp, objv [0], "host");
-
- if (gethostname (hostNameBuf, MAXHOSTNAMELEN) < 0) {
---- a/unix/tclXunixOS.c 2023-03-15 20:16:27.021432520 +0100
-+++ b/unix/tclXunixOS.c 2023-03-15 20:25:12.202242082 +0100
-@@ -23,6 +23,7 @@
-
- #include "tclExtdInt.h"
-
-+#include <stdint.h>
- #ifndef NO_GETPRIORITY
- #include <sys/resource.h>
- #endif
-@@ -113,7 +114,7 @@
- return -1;
- }
- }
-- return (int) handle;
-+ return (intptr_t) handle;
- }
- \f
- /*-----------------------------------------------------------------------------
-@@ -401,7 +402,7 @@
- if (pid == 0) {
- close (errPipes [0]);
- execl ("/bin/sh", "sh", "-c", command, (char *) NULL);
-- write (errPipes [1], &errno, sizeof (errno));
-+ if(write (errPipes [1], &errno, sizeof (errno))) {};
- _exit (127);
- }
-
-@@ -918,8 +919,9 @@
- int
- TclXOSgetsockname (Tcl_Interp *interp, Tcl_Channel channel, void *sockaddr, int sockaddrSize)
- {
-+ socklen_t siz = sockaddrSize;
- if (getsockname (ChannelToFnum (channel, 0),
-- (struct sockaddr *) sockaddr, &sockaddrSize) < 0) {
-+ (struct sockaddr *) sockaddr, &siz) < 0) {
- TclX_AppendObjResult (interp, Tcl_GetChannelName (channel), ": ",
- Tcl_PosixError (interp), (char *) NULL);
- return TCL_ERROR;
-@@ -943,7 +945,7 @@
- int
- TclXOSgetsockopt (Tcl_Interp *interp, Tcl_Channel channel, int option, socklen_t *valuePtr)
- {
-- int valueLen = sizeof (*valuePtr);
-+ socklen_t valueLen = sizeof (*valuePtr);
-
- if (getsockopt (ChannelToFnum (channel, 0), SOL_SOCKET, option,
- (void*) valuePtr, &valueLen) != 0) {
-@@ -1385,7 +1387,7 @@
- (char *) NULL);
- return TCL_ERROR;
- }
-- *fnumPtr = (int) handle;
-+ *fnumPtr = (intptr_t) handle;
- return TCL_OK;
- }
- \f
diff --git a/dev-tcltk/tclx/tclx-8.4.4-r4.ebuild b/dev-tcltk/tclx/tclx-8.6.3.ebuild
similarity index 79%
rename from dev-tcltk/tclx/tclx-8.4.4-r4.ebuild
rename to dev-tcltk/tclx/tclx-8.6.3.ebuild
index ac35e033b305..0de700c1205e 100644
--- a/dev-tcltk/tclx/tclx-8.4.4-r4.ebuild
+++ b/dev-tcltk/tclx/tclx-8.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,12 +7,11 @@ inherit autotools
DESCRIPTION="A set of extensions to TCL"
HOMEPAGE="http://tclx.sourceforge.net"
-SRC_URI="https://github.com/flightaware/${PN}/archive/v${PV}.tar.gz
- -> ${P}.tar.gz"
+SRC_URI="https://github.com/flightaware/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="threads"
DEPEND="dev-lang/tcl:0="
@@ -24,10 +23,6 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-8.4-varinit.patch
"${FILESDIR}"/${PN}-8.4-ldflags.patch
- "${FILESDIR}"/${P}-configure-clang16.patch
- "${FILESDIR}"/${P}-configure-clang16-deux.patch
- "${FILESDIR}"/${P}-gcc11.patch
- "${FILESDIR}"/${P}-musl.patch
)
QA_CONFIG_IMPL_DECL_SKIP=(
@@ -35,10 +30,12 @@ QA_CONFIG_IMPL_DECL_SKIP=(
)
src_prepare() {
+ default
+
sed \
-e '/CC=/s:-pipe::g' \
-i tclconfig/tcl.m4 configure || die
- default
+
eautoreconf
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-02-27 7:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-27 10:54 [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tclx/files/, dev-tcltk/tclx/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-02-27 7:14 Alfredo Tupone
2023-03-15 21:12 Alfredo Tupone
2023-03-15 19:43 Alfredo Tupone
2022-11-18 1:24 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox