From 070c77515d1406e762e9e344856546f0a15765b6 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 18 Nov 2022 06:58:04 +0000
Subject: gentoo auto-resync : 18:11:2022 - 06:58:04
---
dev-tcltk/tclx/Manifest | 6 +-
.../files/tclx-8.4.4-configure-clang16-deux.patch | 82 ++++++++++++++++++++++
.../tclx/files/tclx-8.4.4-configure-clang16.patch | 32 +++++++++
dev-tcltk/tclx/metadata.xml | 1 +
dev-tcltk/tclx/tclx-8.4.4-r1.ebuild | 53 ++++++++++++++
dev-tcltk/tclx/tclx-8.4.4.ebuild | 51 --------------
6 files changed, 172 insertions(+), 53 deletions(-)
create mode 100644 dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16-deux.patch
create mode 100644 dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16.patch
create mode 100644 dev-tcltk/tclx/tclx-8.4.4-r1.ebuild
delete mode 100644 dev-tcltk/tclx/tclx-8.4.4.ebuild
(limited to 'dev-tcltk/tclx')
diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
index e1e96c346be9..73e15662d5ef 100644
--- a/dev-tcltk/tclx/Manifest
+++ b/dev-tcltk/tclx/Manifest
@@ -1,5 +1,7 @@
AUX tclx-8.4-ldflags.patch 359 BLAKE2B 275ed541e5f88bb9ebeaa0ea9e19b5a9554c6aa9c0dba904c4ea99cc97f5d360f1c1c4bd98a7bb5a9257c04f28d46ef7203731863b8a166f3878d0d7b4a024ee SHA512 a7fdd81a615222b805ab1dcb85a619b2621a187a39602f5d64dcf36027a1ee6e616328a7463f4cb9b6fe60169c887c925d133dc1df1cb20f9cb419ba13c870f1
AUX tclx-8.4-varinit.patch 399 BLAKE2B 92173ca104c538655436b991914d421b32a7b09e2bb2b2c6205470653de405c413ebbd2ee5620f0067128f333033d8536f8bd93d05b7954ee36f39cdc07be864 SHA512 68f4e8a1bd1be1f98e286cf4ccba0a97aca2613c13059f8e06e446e376c4ebb8e66d16bbe5e5972e761a58417bb67fcc34b000ef0c95b740a4ad6801f8b43353
+AUX tclx-8.4.4-configure-clang16-deux.patch 2817 BLAKE2B ee47d2371588a499d87196169670879481fe623943d51bff64184e48c36d2281a42cfdbb23c18c5303073a0f1f2f97abe77354ae5dc53962c86ee07387580c10 SHA512 f0cb69678c2eb04a44c5236565dd00331e875c7f0cc0fd18cfd86f931ebd3ab8392f79c8160c6570b7cfe36991f1cc56f2a9c2618189cc3bae7363ca6b528f01
+AUX tclx-8.4.4-configure-clang16.patch 1098 BLAKE2B b81f5f39133ae5bbc2dd6b19280f4b5a6d6f17533da71e7a38f7f5f4e186f9cd81248c50f06d31abfa9421e25ac989e0914976b38a0253a76c2424253237e99c SHA512 3ebaa0f4d1b231847d5355b9bca0efa0878e07a2f35cf0797e8ee5a52fbd329200058885cdd86d5e9f02ad895f5f24da6afaef22f8d2908a572ae0dde09ac42f
DIST tclx-8.4.4.tar.gz 456569 BLAKE2B 50123f95ed780c28dae9e2f0db956b81b559ee9ea33563b999f33a727c451374a63c0cba3012d4dd46df020426c7fdb3b04f932fc5b6ec742156e9dad81a7d3b SHA512 dcf9cbd08eae0cc4901e8e871a440e6c85d7d5ac923306206afaf0a1d931866ce3b91177d7b3a37e87a5cdcccb068ed7b9c76cb1a71a13f4f26cf204b8c42090
-EBUILD tclx-8.4.4.ebuild 1006 BLAKE2B acb554f43814b36f8bce5a80781b1ac52fc8e09f6487704c618eaaf005e6d1999b12e97a605af788c0801db66b4ae2b4e76214379171b41f0450671e8b174f9c SHA512 0241e79e00bdfb9966e2831248cd69f297798aa1a2392d122e476cd8f08671c818390a4c2618273f1408f9c16e6daa43c0a4753026869cc39c2023ba0c6a7e70
-MISC metadata.xml 322 BLAKE2B c162241d2d6f414dc332f2ec8cbd3f44989a60af71286cc71d45a2e3fcc3cb7b2b93916793beceea19b2b8da44f19d40c9c4d8aa392534901801dc68367faee4 SHA512 e9da2f25cee7f1e03e31a4a3af15c1f9bcf68a7033f896cefe1fcd6aa5d4649d68473fb0def44dde379e9ff9a63790e4131dfb447ea57b88dcf117a36ccd91bc
+EBUILD tclx-8.4.4-r1.ebuild 1099 BLAKE2B 870e85c4e7a24de55e941a97f61f6df8067a29dda58f911efa4246cff80369678b254e7da449a5da4975b0167a6ffb41b939533daeca7b8c79157fa9b3f9b651 SHA512 a92cd8f185d42f4b0563ce00953eba55632be67fecec7da39091cb79be4a2cd3dc99855944f70c096b2fb8f836322cab58051d5b91d5f993165aa669d5797ec0
+MISC metadata.xml 378 BLAKE2B 85acc6b26cf2a5686c7f1a136f42a0bfa4fd6319a6f8af581e91a857f5fec673962cf9e72d28be5d928f7b34381fa33a82017789ed015752847165d3991ea21e SHA512 73280ffa0d27b24a103e7531dc9f789173a909b382e466c942aafef54f8df5b7c113c942b34d6824d4aed2dc56404a5e594424e5d44bd7c5d7b55b3ea1e44bfb
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/metadata.xml b/dev-tcltk/tclx/metadata.xml
index 5d724171f964..2b324191ed28 100644
--- a/dev-tcltk/tclx/metadata.xml
+++ b/dev-tcltk/tclx/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<remote-id type="sourceforge">tclx</remote-id>
+ <remote-id type="github">flightaware/tclx</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-tcltk/tclx/tclx-8.4.4-r1.ebuild b/dev-tcltk/tclx/tclx-8.4.4-r1.ebuild
new file mode 100644
index 000000000000..34d1fe02ea60
--- /dev/null
+++ b/dev-tcltk/tclx/tclx-8.4.4-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}"/${P}-configure-clang16.patch
+ "${FILESDIR}"/${P}-configure-clang16-deux.patch
+)
+
+src_prepare() {
+ sed \
+ -e '/CC=/s:-pipe::g' \
+ -i tclconfig/tcl.m4 configure || die
+ default
+}
+
+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]
+}
diff --git a/dev-tcltk/tclx/tclx-8.4.4.ebuild b/dev-tcltk/tclx/tclx-8.4.4.ebuild
deleted file mode 100644
index b0be6efad919..000000000000
--- a/dev-tcltk/tclx/tclx-8.4.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-)
-
-src_prepare() {
- sed \
- -e '/CC=/s:-pipe::g' \
- -i tclconfig/tcl.m4 configure || die
- default
-}
-
-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]
-}
--
cgit v1.2.3