summaryrefslogtreecommitdiff
path: root/dev-tcltk
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-02-27 11:40:34 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-02-27 11:40:34 +0000
commite4be1c42deab59fa5baee33fa9b1c48e5c4c6dc7 (patch)
treeb4534a27fdf6bf08f5703b897a4684732e78151a /dev-tcltk
parent0a5376618896a890256bc26687f4cd8bbe302df6 (diff)
gentoo auto-resync : 27:02:2024 - 11:40:34
Diffstat (limited to 'dev-tcltk')
-rw-r--r--dev-tcltk/Manifest.gzbin5494 -> 5490 bytes
-rw-r--r--dev-tcltk/bwidget/Manifest4
-rw-r--r--dev-tcltk/bwidget/bwidget-1.9.16.ebuild (renamed from dev-tcltk/bwidget/bwidget-1.9.14.ebuild)12
-rw-r--r--dev-tcltk/tclx/Manifest7
-rw-r--r--dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16-deux.patch83
-rw-r--r--dev-tcltk/tclx/files/tclx-8.4.4-configure-clang16.patch33
-rw-r--r--dev-tcltk/tclx/files/tclx-8.4.4-gcc11.patch192
-rw-r--r--dev-tcltk/tclx/tclx-8.6.3.ebuild (renamed from dev-tcltk/tclx/tclx-8.4.4-r4.ebuild)15
-rw-r--r--dev-tcltk/thread/Manifest4
-rw-r--r--dev-tcltk/thread/thread-2.8.5.ebuild1
-rw-r--r--dev-tcltk/thread/thread-2.8.8.ebuild44
-rw-r--r--dev-tcltk/tkcon/Manifest6
-rw-r--r--dev-tcltk/tkcon/tkcon-2.5-r1.ebuild34
-rw-r--r--dev-tcltk/tkcon/tkcon-2.7.11.ebuild (renamed from dev-tcltk/tkcon/tkcon-2.7.3.ebuild)4
-rw-r--r--dev-tcltk/tkdnd/Manifest2
-rw-r--r--dev-tcltk/tkdnd/tkdnd-2.9.4.ebuild42
-rw-r--r--dev-tcltk/tkimg/Manifest11
-rw-r--r--dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch18
-rw-r--r--dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch11
-rw-r--r--dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch11
-rw-r--r--dev-tcltk/tkimg/tkimg-1.4.16.ebuild (renamed from dev-tcltk/tkimg/tkimg-1.4.13-r3.ebuild)41
-rw-r--r--dev-tcltk/tkimg/tkimg-1.4.9-r1.ebuild105
22 files changed, 144 insertions, 536 deletions
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index edf97a5097d9..6f0e77d88289 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
Binary files differ
diff --git a/dev-tcltk/bwidget/Manifest b/dev-tcltk/bwidget/Manifest
index afd340012b43..0424c8606af0 100644
--- a/dev-tcltk/bwidget/Manifest
+++ b/dev-tcltk/bwidget/Manifest
@@ -1,6 +1,6 @@
AUX bwidget-1.9.8-test.patch 499 BLAKE2B 186ea474d9efbebe4e710ab67a9fb675d3a9d3c892a5363d9f1a31aa00362833e11bf38a0cea353e40021e3717e39333d974d320024ac4b5c5686b6ed3c86c63 SHA512 cea568ef4c932b2b7dff5f8afd0d47e7c000c368d53cd23826f76e9f0446aa789df4391197662e8623d03381fd477928beb5f4bf687ddb48646cfdc9017cb064
DIST BWidget-1.9.15.zip 329390 BLAKE2B 011bc3e303082af8ec4aaf1bfa3812cec0e0c91dac41db867d5ebd5883949795d5877a53050be31823a218fdbc5113df8c848378af133ecb26dc07f5e8360b1c SHA512 cc3c46a112e902158c3f010941efcd51b42adae5b989511b325c619bffe79c3a11d74b044619e1ed9ef4b77abf18f7a2e8dfbd3fe46e1d26a1b61a02c3a3096c
-DIST bwidget-1.9.14.tar.gz 261654 BLAKE2B 2c0e8ed33624f6304e775da3be02975aced85c8eeb8ca7fd736858a9323f7bd6aad96bb3697db1c9c571d5dc72ff21d3c161d4f2a8ada83f9ec615391c0f1890 SHA512 7db9c69ae423e97356ff3e54ffc77a450fb967907b32356f343aa4321faceb3e807e63babb2edf0e2c6ab086af570dbd6a02a85e4ca2c1f020ae4df78c8f0fe8
-EBUILD bwidget-1.9.14.ebuild 786 BLAKE2B a44e9a3a1bcd2030d8e4b838f4c60e92934f77250530cea445241328ba148637136f9d1b4dcd39ac30a68cc61cb398497f0914f100d33f56ab4bcc4eaa2b16c7 SHA512 f628ab4387c97981c0aea500c7a52219a0ee3e172720079b53912285adbda1aad48b2a09d6a4993f771042f8dac741db3c6a4e99cf36245b18b21ce44efc0a63
+DIST bwidget-1.9.16.tar.gz 252813 BLAKE2B 2e8aff10d73e5782603a62991551d83cce6b88513e2a1b9487105ed2778a144f10e1815be7a4a9e34e2e036efb9526a221e4a880d53e30bed85bbc67c852141f SHA512 1355e8d8fa784d4bb72a82eae267b6c958cd7d401d68ded05e296929b8d39d64aeab4620c7c9acb02d31bf8da6c3da15460429f95f8d07846f68a8e86257f43d
EBUILD bwidget-1.9.15.ebuild 825 BLAKE2B fa41c5a129cf4fb8e95f8d0e88033f67e1742f04313a8981e141fbde79cbef902089a7578f8608be5bf1532bb2519c18efe90182b2981f080f94721bb6a9c121 SHA512 d97d95dee95d0cac4f3fa6feabcd8e8efca3920c5f9e5dbbdc3c4b468e7c32f4d64d7aeebde472e6a1b833a412be3761d9a240f30c4509f644eb8e66f32e75f0
+EBUILD bwidget-1.9.16.ebuild 791 BLAKE2B 86950fcd124be2d06b32823677d826e73175d6df21398ac573c2a859951897cc41053d20c161635db2c3a4bc2b639ff4ea2ed67b154f7ee98470b404a00f5d48 SHA512 1506dae6fb1ff7da6b18a9185f27de0dd5105580a8271534ac244b2a087aea0c35fe1d1e86f8c45862cf1bdd19fb703237b1e489648e154b73d8d4f19fade6f9
MISC metadata.xml 330 BLAKE2B 804934011048a0886fde1667b6caceccf3c937ddfa56eaec506e3f1f0e6c275ffc2bc07c8ca4e3fec49acb39814d437bfa820bbd04b8e1111b4e1004a1678e40 SHA512 c662b10581abf645c410376a8618e19e7d7d3fe9fa54260b538105760832779bcb38c83518bedcd475d60c14c4a98c5e3e4a1bd00fc8497f5125056add78071c
diff --git a/dev-tcltk/bwidget/bwidget-1.9.14.ebuild b/dev-tcltk/bwidget/bwidget-1.9.16.ebuild
index 1ed8f4bfa110..a6b28a07b2df 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.14.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.16.ebuild
@@ -1,25 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit virtualx
-MY_PN=${PN/bw/BW}
-MY_P=${MY_PN}-${PV}
-
DESCRIPTION="High-level widget set for Tcl/Tk"
HOMEPAGE="http://tcllib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tcllib/${MY_PN}/${PV}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/tcllib/BWidget/${PV}/${P}.tar.gz"
LICENSE="tcltk"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="doc"
RESTRICT="!test? ( test )"
DEPEND="dev-lang/tk:0"
RDEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
PATCHES=( "${FILESDIR}"/${PN}-1.9.8-test.patch )
diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
index bb7e7bb25d2e..eb70a815457f 100644
--- a/dev-tcltk/tclx/Manifest
+++ b/dev-tcltk/tclx/Manifest
@@ -1,11 +1,8 @@
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 2857 BLAKE2B 9e088477d6abcf8211bb75b6d1da08fee6b85e2cfe26c4c4d861f1d9dd0ecb2bab14580b9074e93b7306eca60d1e9c2c5c1b4e1c3eef439f99b2a9ff4565e344 SHA512 fe9ead80d9ed0ae0d9cbe51a3b69850aa9b1297484514bb4bebcb558b058644eeccc0c7520a3032465f4d800582ac31b8909a944b48210147781faafe7f6b818
-AUX tclx-8.4.4-configure-clang16.patch 1138 BLAKE2B 29ab8278d758ab4bed1c01f4234dced3ff2d17188a12207677dfed9b4cb8f56f8f854b5e68e8f3b1698e5115779d723c6c8f8d4863a80e699c5e0c850368b6ce SHA512 fb950278705cc2ba7d37cd79592a9cbad891ed91244678e3ac0252d083c421a9631220403cd7090a3edfa9f0b7757d004d909bd400431fcdb5e71a594452fc49
-AUX tclx-8.4.4-gcc11.patch 5971 BLAKE2B e91b897f871e990dabc70c56054ba2b90f5f0406cd06af121c5e0dca45ffc15c24802079ecd3eff881238e26027914966fac651155a83206ce8a91f1b8fb9c10 SHA512 05528d6ae322dcbfcfdc74bf16cb87e63214bd988c28487e92dbcf85ffbb0e6c5ef15ab8f24f09644889e6cd1430b10876ed148ba63996899f13f47274069af3
AUX tclx-8.4.4-musl.patch 904 BLAKE2B 041cbbbb7d03449328f68c4a32ecd92e9abb5d13f321ac2ed1eae76f0fee013ef4324740544b0363eff08ccf41a692369f40173ccc9fde15fe554f916aae9920 SHA512 5103121a21c83aee822627edb0c6ada918b5b84fbd964dd33725f95e2b40ca4ea2f1e0de16d61385a5c9828feecdda192de80d8bc4f66f8cb67cde6cbe224851
-DIST tclx-8.4.4.tar.gz 456569 BLAKE2B 50123f95ed780c28dae9e2f0db956b81b559ee9ea33563b999f33a727c451374a63c0cba3012d4dd46df020426c7fdb3b04f932fc5b6ec742156e9dad81a7d3b SHA512 dcf9cbd08eae0cc4901e8e871a440e6c85d7d5ac923306206afaf0a1d931866ce3b91177d7b3a37e87a5cdcccb068ed7b9c76cb1a71a13f4f26cf204b8c42090
DIST tclx-8.6.1.tar.gz 457438 BLAKE2B 451b90a6f4403177604684a2a4475a057924faa4b625ac035d65b622b69e8dfea7146143056491ce8740374c18c4fbfb0184a0d074bf799897a01bb767e1695c SHA512 4a2293aad667b108f19f837686044fc168831781d04a9f8eaa2afe677c587f1e128a536ad9db609720e0046a20ff6f8dd7a0e5dd1232ef775c5a14e24ec0614d
-EBUILD tclx-8.4.4-r4.ebuild 1270 BLAKE2B 7aeffa009483a1cb9671fcc808719f6ccd4f6b97fea182b8214f525d2c286e228b3f10d9604826a72255f2f36780104fe91a5cb26048dfd25979b741ea02d45b SHA512 1a246afd13b9a1b6470a6c9631d7d90986d261ba4dab63121e044bc438aefa37d6699b1590bb180df548ab9c70bd96734fb278fdb70b906e56014a35ed7d81bb
+DIST tclx-8.6.3.tar.gz 457293 BLAKE2B 4d3578c0312bc2a0a0cfe079699893818ed6bce941dd84d4cb4786891e784930e0172c4c15892a2b81acf0f4a5062145e9f4397842185358b49658c692cd08cc SHA512 680b8916ccb5725ed173b45549c94e7b1e17c4e5cf700c3991d2791b9f299660e94c880401dccfbff7ca630036c0781c41a9692c2d8ead2e7ad880e2e05a69e7
EBUILD tclx-8.6.1.ebuild 1153 BLAKE2B 948d28c5390cc36649a6a8230718d0c5db6f71e55c0963a9d911f8a246596d9ed4f63266f066351cda59d5082819794811c7da08aaa721fe4c3f26393f1a5893 SHA512 d2a659836b4182aa4bf3c38e18aae75926e8eb083900114c107f56d7fc67ed4cfc4856f6eb7c60e42c4767aac6ec830718e49c8ebb16912946573fe3b5f308da
+EBUILD tclx-8.6.3.ebuild 1118 BLAKE2B c8873bfcc881ff58f9c5f8b4b3d53b6c601f9f012cf484a6cb3f87fba9c67ca58dbaefb3a4405593ba7d56c0c7e6dc920b2ff0acfedd71d4d1affdfb9f2f71f6 SHA512 26ea45e4d55a5f70c06589b373cd4542a3690d0cd91dc7c97c6c28f88c1a41b2628fa3e3e1a2c3954166e334ee52bd8b9500940e7f31164b58996cb93488521e
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
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>
-
-
- /*-----------------------------------------------------------------------------
-@@ -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;
- }
-
- /*-----------------------------------------------------------------------------
-@@ -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;
- }
-
diff --git a/dev-tcltk/tclx/tclx-8.4.4-r4.ebuild b/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
}
diff --git a/dev-tcltk/thread/Manifest b/dev-tcltk/thread/Manifest
index c75c7a07c9e4..647e1a3e1960 100644
--- a/dev-tcltk/thread/Manifest
+++ b/dev-tcltk/thread/Manifest
@@ -1,4 +1,6 @@
AUX thread-2.8.5-musl.patch 621 BLAKE2B bbaf972b18eae3f5e9c53ef525a69892e284ea3b08a8bc6b5c1cc1c41e6dbdaea525feed214e568ed9ee33bc62d454ff01ae85eb8060f2daa6e74eb0216aa11e SHA512 d627cfa29000272ba686436bad273e0fa3bc8ea0f5415bea0b7b41aca88fb6f13ff16f3fe393bf1bea94502fbef59a8b998e3ca8145b5efe9989c11ef4e83408
DIST thread2.8.5.tar.gz 338776 BLAKE2B b6500ba59f87150d3d4479cae9a55b591a41768c6a74520933157d8fe2ec5374a79cf258fad1f08c775b190c17667dc529605f21a4fdd562320778be94b294a2 SHA512 b1cd049605f44ea5e85a121ff864d9e531491b24579654159dd5f3850b0aa4192ea79844324be3e9c6b395b14e6f765474c792bfd3271c7100b49f0ff22832d0
-EBUILD thread-2.8.5.ebuild 970 BLAKE2B 0895b76ea6b6fc8dae463e7d244a063749e5e481645428e2b871ca237d62c5eff3dc1c4887e44e64c36faa0bb12c0e3cb69dba3a8955c0f083e0491584a42230 SHA512 e6ba12ce63b93588d06272092599d377cbb1bd1ab0e2c9c61d840b0b71d0c3e04ce1cb943374a9245486b65da549c9f274ee17c5483512f0d8e3515bad6e1bf1
+DIST thread2.8.8.tar.gz 343099 BLAKE2B 3551bdbc4cab78c6ea0ea7eac43c53a65a1f55f9eae302ddd7030c33b40b76317ecc651d731411396cf4f51f11c852bab0c60642d36a312f23e22f96019df427 SHA512 249ddf689ee20536280e3b3d220c0faa3a8a2821bcd31a3f6188ef838d31e5cacefa7fd737b8e29b73a6b30e0a946d2eeb0805dd851c9f8aefc5c5bc5f50de0e
+EBUILD thread-2.8.5.ebuild 962 BLAKE2B 803ce6051952e29175d67fc0026134c9d0ae01a149c0e18afed5663e877e2a4e6193f1763f873fbd0ff69c83dbf2fef3ed495fe1696a33ce4d4dc1fb1398da18 SHA512 32bccc56fea95d4512e4131d0edfd65b9ff2e1008fd530424f4f67a57b0b3728745ef1c7f7c0f1a39792e388135b1d29568c0e900fa0d802433a0154f49f222e
+EBUILD thread-2.8.8.ebuild 974 BLAKE2B 6122060ec58407294b9fbb3d343385323a5b71392150223595ca7fc65eeda035f3f449964925704886b6fb461adf5a9da0e6a66ed53cedf4393ac1a3ccc8da5c SHA512 00c260a03750210ebf8d722668162151e30b798eb510e189ed3969d781f01192de34990045583eddecdf1b2af1d9c3461e44af981ea1f3adc11ac91c825fe5c0
MISC metadata.xml 327 BLAKE2B 9c6750d70cbc24484b08b3c432ebf81c509deec9a90dc165ac4a105f674fec41534ee4a1fa86906fa12a1827a5e74fd3f643d4074f7b460602fbf8c6e5d45aa4 SHA512 be62251113a18474869742b647b76847f4974782c8023e016941a80c43596b0a6044787576c2813b8ac7f76d9577238dbd041a42818e906e09d51613c85112a0
diff --git a/dev-tcltk/thread/thread-2.8.5.ebuild b/dev-tcltk/thread/thread-2.8.5.ebuild
index ac9589a23cf2..299354e5ba6b 100644
--- a/dev-tcltk/thread/thread-2.8.5.ebuild
+++ b/dev-tcltk/thread/thread-2.8.5.ebuild
@@ -14,7 +14,6 @@ SRC_URI="mirror://sourceforge/project/tcl/Thread%20Extension/${PV}/${MY_P}.tar.g
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
DEPEND="dev-lang/tcl:0=[threads]"
RDEPEND="${DEPEND}"
diff --git a/dev-tcltk/thread/thread-2.8.8.ebuild b/dev-tcltk/thread/thread-2.8.8.ebuild
new file mode 100644
index 000000000000..0d61f5d80f0b
--- /dev/null
+++ b/dev-tcltk/thread/thread-2.8.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Tcl Thread extension"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/project/tcl/Thread%20Extension/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="dev-lang/tcl:0=[threads]"
+RDEPEND="${DEPEND}"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ stat64 # used to test for Large File Support
+)
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-2.8.5-musl.patch )
+
+src_prepare() {
+ default
+
+ # Search for libs in libdir not just exec_prefix/lib
+ sed -i -e 's:${exec_prefix}/lib:${libdir}:' \
+ aclocal.m4 || die "sed failed"
+
+ sed -i -e "s/relid'/relid/" tclconfig/tcl.m4 || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf --with-tclinclude="${EPREFIX}/usr/include" \
+ --with-tcl="${EPREFIX}/usr/$(get_libdir)"
+}
diff --git a/dev-tcltk/tkcon/Manifest b/dev-tcltk/tkcon/Manifest
index 8e1477dfd382..8b464ddf2a2a 100644
--- a/dev-tcltk/tkcon/Manifest
+++ b/dev-tcltk/tkcon/Manifest
@@ -1,7 +1,5 @@
-DIST tkcon-2.5.tar.gz 139834 BLAKE2B 95d0d0fe856b9ed287d1b2af6132845e047d269991fda8fd0ac88b06b200e1e75d9ac5b3ad4bac7daf08d52ebd2a4ec5697c841565cf290980288b0ecf0449a6 SHA512 f53d21dbf281112b761970b05aa643d598819789644445a0e01f6eddcf98709c4b7ef635bc69ec40fc14b5c78397b240b86d8b6ed63aac48f656242c19fd7851
DIST tkcon-2.7.10.tar.gz 277788 BLAKE2B 7894947c5ca062f2b905550e88c34a414d4b665b6fff0c5bf22a54e2600050b62eecbdfbde179206571cf74d39e3a9d9e33b93356bf5b81aa9cbf79dcdfcf118 SHA512 a580e06d0c86613b3c9e9daa7863fde6fd11b4e2243764c0b016f0db9d9ba0a9cf839ae26efc37e843f5da87f6304a6d0fcab7667ff6c25246a44e1630851634
-DIST tkcon-2.7.3.tar.gz 278421 BLAKE2B 67e4f2d441808f26f46a08423e278fbd219cd02ad63e05de2608521066e75a041cba055296628a5b800fec516e6f26994fec413a9baf10c34aa309e04a2a9477 SHA512 2cad55d861059bd615a2084a796e99c7654ad40e50bdb209b4e4bcb36a6051dc9ac101fbd09cc29f9582ef02254c1730297eefc8e8d426c25dd25f4590e6aa25
-EBUILD tkcon-2.5-r1.ebuild 716 BLAKE2B 259c85d6e36f31b587865588364f3c80dc405283538a201021560251f37254cdce0054797285c0767bac86c77c2a9cc49080055fdbeda07ef7b500c6c42b22c6 SHA512 d76dcdf27aa8b07d90046e421854750cdebaa8cdc6f6e866b41f1a69a04aa30f30d133ab31d006e710df95c7acc61e77a99d48bca08a708e93d3f59cdf8162af
+DIST tkcon-2.7.11.tar.gz 280499 BLAKE2B c68991100e95f347796c34253b6a4aceb4e1b20a6d6d99b64750b5c50117317b3b571054e6658afa27cf4bbe4af19a6c7c0dc03f68e9e95eec428a84ef910df9 SHA512 d56268f8edfbccb66ef6288d5b98481dc0c2a8e4f97e553e8031175dad5922ad14087f55709e41902a812e738d29ae9e07efdc6ce2d30919801c9bb54cddab07
EBUILD tkcon-2.7.10.ebuild 774 BLAKE2B 9c41e0bad397d7526e97a353db780b24a45c39920a89dbe0c13d22aeb3806c6618524116d5e369f17f0622f262c8f7ec1a57c7a6933061be4d6ce81c8de1a31f SHA512 9a9cd1e83f36e71e22294461e9b4f922cb6e5b18b6b52af2daaeb2e66da42e2fd216c8160bb0574d9f1ec5be6e882c3bd44613c15514a8df105103201c117cb4
-EBUILD tkcon-2.7.3.ebuild 774 BLAKE2B 9c41e0bad397d7526e97a353db780b24a45c39920a89dbe0c13d22aeb3806c6618524116d5e369f17f0622f262c8f7ec1a57c7a6933061be4d6ce81c8de1a31f SHA512 9a9cd1e83f36e71e22294461e9b4f922cb6e5b18b6b52af2daaeb2e66da42e2fd216c8160bb0574d9f1ec5be6e882c3bd44613c15514a8df105103201c117cb4
+EBUILD tkcon-2.7.11.ebuild 774 BLAKE2B 38ce0aa5fe0d4fe37c0cc90efdf4411396fc92065dc86b56292bb9dd8d73df323c6c6689844d235b203f476adb985efbe1ccc87be671bdb783289b1cb214c1f7 SHA512 e8fdaba6507f7e5104a5631747a7dd3839950b99e91ced390ff965fa2a96df75b78d9e6656e06e8cd939e3de771e42033ad2527b902302fb1347880ee8059625
MISC metadata.xml 747 BLAKE2B 44a8f26c91ac83bbe20963cd2e1b07346b2b92b6a46969098547dae1161266c2ca445b425aa0c701766aee50655036f14d9f339f0f251b5f65a53fb5e36e69e6 SHA512 6a2cd080e46db84103720b20b7c06403b09f52c0a632826c5ac11d6fbf7058556e5002d1bcb2f5c851fdfb5d28609dc62d171e55f85f62793430f55bfa5673d0
diff --git a/dev-tcltk/tkcon/tkcon-2.5-r1.ebuild b/dev-tcltk/tkcon/tkcon-2.5-r1.ebuild
deleted file mode 100644
index 6594a06ec59d..000000000000
--- a/dev-tcltk/tkcon/tkcon-2.5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tk GUI console"
-HOMEPAGE="http://tkcon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="doc"
-
-DEPEND="dev-lang/tk:*"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- mv docs/changes.txt CHANGES
-}
-
-src_install() {
- local tclver="$(echo 'puts $tcl_version' | tclsh)"
- local instdir=/usr/$(get_libdir)/tcl${tclver}/${PN}2.5
- dodir ${instdir}
- cp -pP pkgIndex.tcl tkcon.tcl "${D}"${instdir} || die
- dodir /usr/bin
- dosym ${instdir}/tkcon.tcl /usr/bin/tkcon
- if use doc; then
- HTML_DOCS=( docs/* )
- fi
- einstalldocs
-}
diff --git a/dev-tcltk/tkcon/tkcon-2.7.3.ebuild b/dev-tcltk/tkcon/tkcon-2.7.11.ebuild
index d0d15951af1d..6ee739f1193b 100644
--- a/dev-tcltk/tkcon/tkcon-2.7.3.ebuild
+++ b/dev-tcltk/tkcon/tkcon-2.7.11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="Tk GUI console"
HOMEPAGE="http://tkcon.sourceforge.net/"
diff --git a/dev-tcltk/tkdnd/Manifest b/dev-tcltk/tkdnd/Manifest
index 5d89fdaff61c..c2a52eda8f43 100644
--- a/dev-tcltk/tkdnd/Manifest
+++ b/dev-tcltk/tkdnd/Manifest
@@ -1,3 +1,5 @@
DIST tkdnd-release-test-v2.9.2.tar.gz 573739 BLAKE2B 4e9cae26542cc7774a0faf3d91a8a3f3b3b598735fcdb4e0565be26893514fe2e3f301ecaa7c698913f570b30f37ba0e2e890c6651ceebbc5d6cd9f66caf57c8 SHA512 dd1538ad884e8287d9c90c3b1565b95a047f552a271f921b0d0d7cb7bde8d8d6ad7e8c3247b647c09080c2e23c57ca11c30bde516cf66abcbe1dac6dd0e7cdc7
+DIST tkdnd-release-test-v2.9.4.tar.gz 1358824 BLAKE2B 7ea5039825cdc160232bc987a903642b2b2e54973c7f45142b5ea53e6b8ec2b2249416a0220217dc1ae1475dbcf432e2c8c72954f850eb2009512f9ef06b0644 SHA512 2eaf84235443c4a69e411674a7a7b27a1d43ded8aba7b09ed4d2f128cc2bfc9e38018c337004ce7bf0a0082dc0f87a7e89c7c2fc50dfedbb1047deef1d73daa2
EBUILD tkdnd-2.9.2-r1.ebuild 858 BLAKE2B 69440496e821ae451f6a1f291ff4dfbdd508525d5e2377b0aec9593492a28d02b8db5b4616993ab11ee91049cd73c1652d77574fe277b7644ad1f9a29e44834b SHA512 00956e758de36f12de1ce282e4d72c2da47038b124ccfaec652d04cc9e33e02832484df24c88fc27c131b0496eae7632fd93eb4f24ea6ba8afa6c72908e4e657
+EBUILD tkdnd-2.9.4.ebuild 860 BLAKE2B 3632e898d01d31a5bade992db65193d0dc94e8cb99f273deb53dd16424b83e896e24a14116ec2850a1ca8f14c06bd7965ff5c65fb8f0e7f3021212259cacf184 SHA512 629bc145264d644532b75fe9aed16d1233ac390666ab78cb38040838a0e8aff4e320441e8230597904aee80e830fcf0e97590c97332efd2e1a58d01ec24422f4
MISC metadata.xml 382 BLAKE2B dca54caddebe850e7f2bb6f1a77d9d588727a08330cad6ce5e1e07ac739951756da3eee9e13b1bba2e2a9382a9baa4758246b5aed9b1f29f297f1336e386d695 SHA512 3950749c3cd4e4fd185c99786c0dfed4e6b652a83739c63830d6fd9ac26d60cb527c8358f8aa1738bf19ef3dbf42df35b3ffe775d0d2cee476d28cc8ac72fc9c
diff --git a/dev-tcltk/tkdnd/tkdnd-2.9.4.ebuild b/dev-tcltk/tkdnd/tkdnd-2.9.4.ebuild
new file mode 100644
index 000000000000..014f6d7ec75a
--- /dev/null
+++ b/dev-tcltk/tkdnd/tkdnd-2.9.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${PN}-release-test-v${PV}
+
+DESCRIPTION="Adds native drag & drop capabilities to tk toolkit"
+HOMEPAGE="https://www.ellogon.org/petasis/index.php/tcltk-projects/tkdnd"
+SRC_URI="https://github.com/petasis/tkdnd/archive/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug threads X"
+
+DEPEND="dev-lang/tk:="
+RDEPEND=${DEPEND}
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ stat64 # used to test for Large File Support
+)
+
+S=${WORKDIR}/${PN}-${MY_P}
+
+RESTRICT="test"
+
+src_prepare() {
+ sed \
+ -e 's:-O2::g' \
+ -e 's:-fomit-frame-pointer::g' \
+ -e 's:-pipe::g' \
+ -i configure tclconfig/tcl.m4 || die
+ default
+}
+
+src_configure() {
+ econf \
+ $(use_with X x) \
+ $(use_enable debug symbols) \
+ $(use_enable threads)
+}
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 719aa440975f..8736874ce8dd 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,17 +1,10 @@
-AUX tkimg-1.4-jpeg-9.patch 364 BLAKE2B bc9b3e4e404b49a9909d7198929033ebee4ab839f1f2ec71aea9435637bdcb6a3f0dd9c2ed379d9e0f7215853b0e693337876ac0842a37b32533151ef4d9b739 SHA512 4bb6cf0b7774700d607bccfb1590660344754749c40acefcba23046333b1029006acede784177473c629ab63247402bbbc4ab172946485af950c5e8ec6abb8c9
-AUX tkimg-1.4.13-test.patch 313 BLAKE2B eee0540a659b4ec7af738281e14847228cb596344792f7b8e2c9c690ac37212226b2cc5979649626b9729abc75571ca42ab96f41deed71075970b75eec5ca1e1 SHA512 189920d66119f08c8330e501b681717d5737a2c2bbc907294367d75cefadce0354c876135d788d44de5bf90ba199953e9a0a1b41b3c1aec13d45f1e1d74de796
AUX tkimg-1.4.14-gcc11.patch 2795 BLAKE2B 48d3f322def2d49ef56808e6e27e118435a5bad1141f5f667c05cc5166659e49fbcc4b0336927cc8487cf038951a4850ea94c717131e4ebd545dfb59032b1835 SHA512 11f8815ce4a8e9917ae3ce6d460195602411e01719831dd7acd43392e46873dc9e590779e740b6d74a16dc932e6a50ef830f928b13372e163c24555d7e00d413
AUX tkimg-1.4.15-gcc11.patch 210 BLAKE2B 5e7bb38fc7e1e8fb75dc5b763e867dd147be6442b0561f7d7f6c00e7e64a0ddf6a8c400deb7655bc7254acb6a6ea454160747417af232b9d988bf1d134147013 SHA512 2056c029a782f5ee582f1cf22ef6ca50ae9dc4a38693473bc84daa609113dfda859fe5aac28982efdb425e0bc4ca5be49ae30d0efeae8498d352bd80d6d8d328
-AUX tkimg-1.4.9-fno-common.patch 274 BLAKE2B b3b3ac5c7e849195fe7dbd6a86ad085825799144ddd05b445abe96577e41a52b50665aaf04fc08cf43a3b5d3d3b1a3a5494a59f8297f68036df4c7948d83dc90 SHA512 8599751f097914fa2757fed9599f3df08f6941c3693d4216f5dcb60a4be8bf603c4869b3f55cf12bea2752d77114c7c1cd2890de1b5635a0665a12053117712f
-DIST Img-1.4.13-Source.tar.gz 8366556 BLAKE2B 9e9ddeb5681300fdb320a7f428cf1c30bccee51c9b204690c82f37a72283e1f5300227463d878eb9aa3ea92ddab666d1e8aa4e51bf8fbf219058109b8c76432f SHA512 922d22a664a1cab06932361a25d26c23f282037eb342dcc96a60c5a40f40d7e546ce6154d56552a7722c071a004c12a45cc687fc8e139f3edd3a7c7443f3861b
DIST Img-1.4.14-Source.tar.gz 9844859 BLAKE2B f373859104c7f1b2d2b5c10adf6b8d3349e22765936916b493589772d2b56e1717cbecf074034989e7e927df16d387ff6533170a1ae9f677ea358a96a86fe67d SHA512 41bfc6909a6836cbdce34f5e5672a02ac67e6d7263a97d48b564994462cc089905a0824444bd849b6d228750bf09f0cf617989dc9008705938a283fa4e5f1b45
DIST Img-1.4.15-Source.tar.gz 12108837 BLAKE2B b423457f7edceeff38389644e206f2a96204d5f3202a5eb224d9f9a3e4fd2a031c6efb9b53ed72a53441b4d306f4bcdc3ece5d7a08b19e478ed2c74ad66d870e SHA512 f034f7b1cf8b02e0fb80f723927c8512ca67de661b21ee53ea4cf0ec8c09a151466fae0e90395f140834e46e4c231dbce8fefaf870fab41c9dd5a1995fe0d978
-DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b SHA512 c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
-DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 3b172f4a5cae4d9ee0668957a5991317e4ae882f450335412488fd408971717facb0c1e1760dc55c20b14e315246017975699d3c1ff9968c3f8182198d85c62a SHA512 a9b9d9b7d0a1faeb7da02a5c7f2ee363e4cb68914ec5c39867ab6ee35b6df988e36d653536b48512361d3a0130c38683f72bb6a76a251820d8689398de3e73ee
+DIST Img-1.4.16-Source.tar.gz 12129708 BLAKE2B 5da76a42a1643d759d765ade01a8a9e9782cba21d30f5ec95693364d80aca32fa54f610081833d44bf5723e6901d7577e93bd4d4285880e855e835ae6a901f4b SHA512 622549749d41c7c026053cf82b4c434602ff541b9ee7f6f15c2450fcf3cfb34eb8277432267c78adc3dcc60e53fa2d84b7cf98c5fd5a6c3cfbcf0f60746cd227
DIST tkimg-1.4.14-patchset-1.tar.gz 3256 BLAKE2B 8f182365b70b4d7a3f4d9002618285b11293644755304600d302fbb8cf8945cd4bd4eb45e66ed0aec93d19e42556ef294508587f7d4e66821ad960ea5c26c7b6 SHA512 8c93e2b669b56ce5621a4d6d96e7412f623bd42dd777a99ec74741621a5be84f24f47149efae58baa874f49088b053b8466d16dffd79edf9594195ff41c38c0e
-DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5 SHA512 596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
-EBUILD tkimg-1.4.13-r3.ebuild 1999 BLAKE2B 92dd77e25c0972002732a5e657ce86b46096e31fc005fd2f7fba5015a88db80183d801b51a49342c5a217af2807bbc59b37bb925d73de06dc1950861a7d40610 SHA512 13a1aa296200d158191882a85e945a34fe65d0b1029e7f13486d4a5b37c01c5c4ad1c0f3dd5d29c78cdec359b463f76ccea93b14a0cae20ad18579115f2a09bd
EBUILD tkimg-1.4.14-r2.ebuild 2445 BLAKE2B 412f069045ba581152106f4b4456915e8e5a163eb4b9352dde14c27cc5e0d8eca252b88bd7ba56a0a5919541215f7b63754716496105ac30bff7cbbdf44fccd1 SHA512 07aa6053f2758647062397208702a9852ae4898116766e76377b9884a36d1dda358623d9ffe64221d0eba770778e44f0c561e0e0131a856b7223782ccfaf3178
EBUILD tkimg-1.4.15.ebuild 2509 BLAKE2B 8f213dcab6e668840b2671ba7468e71a38f8676d62344b91af2a45a8a600ffd9c4837260a7d17ea0ec970c529113a41e420eabb37f905cb736faac8053d491fb SHA512 e2f767cff1bae45f4c8bf89b2866be75a32c8e0451d212a1951cff4d7fc5b796ab2253924489e5cce88af1930fd55512784f4d032429719e703a74cec7a7cd7c
-EBUILD tkimg-1.4.9-r1.ebuild 2310 BLAKE2B b698928eacaba3e3ac461b6318a79f00509ac9e9af100a71babd4c061e9ae3832de972c511dab7cc3ef2e9eacd674f4a30c6faf25c092ed3b4bf9cfa767848b1 SHA512 148972819ebed0d52ec735cf851eb6d1cfc7b19881c30b989c708a0ab3bc031fefcb88fbf32ac87907200daedecba95be44c9267493605febdfe1d8295839b57
+EBUILD tkimg-1.4.16.ebuild 2509 BLAKE2B 70ebb8d9648cdc771633b5d4fbf3cd41a4be1c7b520814d765cd44b0560f1c6462ca57d0f962de743ff4c4ae25516848c71ead9562ac1203f79d40cc5d4495e2 SHA512 427c67fb3b91dd7dd5fe14154f8a4ee6c6c204be65608187e146adb0f209cf31a33932630303814d4075f27223635b140642c54c6d0e4175d306f1fb5104c511
MISC metadata.xml 329 BLAKE2B 53d89f1f85a90a476918fde2904b7be67b22b1793f8d09655b2ca18525cd9f2c49ae2848fe54b4206a49da23a9d9ab54b0750ac5437d0591c306a8311a2c945e SHA512 3a12737d8033b88e6a418f2183c8013e75777f5a15774b11d4d93b4e27360d136ad0ecfc6ff0e5d4097d669542e52e6a1d71114e4c1d1bc63ba45e0f9a0caf7e
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch b/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch
deleted file mode 100644
index 23000ac7922c..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix build with jpeg-9, bug #520886
-
---- a/jpeg/jpeg.c 2010-06-17 15:40:24.000000000 +0200
-+++ b/jpeg/jpeg.c 2018-02-07 23:26:38.050073397 +0100
-@@ -53,6 +53,13 @@
- */
-
- #include "tkimg.h"
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+#define HAVE_BOOLEAN
- #include "jpegtcl.h"
-
- static int SetupJPegLibrary(Tcl_Interp *interp);
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch b/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch
deleted file mode 100644
index 840e013b6915..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in 2022-02-17 20:34:02.134144390 +0100
-+++ b/Makefile.in 2022-02-17 20:32:31.957625786 +0100
-@@ -109,7 +109,7 @@
- do \
- here=`pwd` && \
- cd $$sub && \
-- $(MAKE) top_builddir=$$here test || exit $$? && \
-+ $(MAKE) top_builddir=$$here libdir=.. test || exit $$? && \
- cd $$here ; \
- done
-
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch b/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch
deleted file mode 100644
index 307dfe314375..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libpng/pngtclDecls.h 2020-04-13 20:16:18.542559383 +0200
-+++ b/libpng/pngtclDecls.h 2020-04-13 20:16:33.921314336 +0200
-@@ -1369,6 +1369,8 @@
-
- #ifdef __cplusplus
- extern "C" {
-+#else
-+extern
- #endif
- PNG_IMPEXP const PngtclStubs *pngtclStubsPtr;
- #ifdef __cplusplus
diff --git a/dev-tcltk/tkimg/tkimg-1.4.13-r3.ebuild b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
index fea14e66d812..314a997d59a9 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.13-r3.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools edos2unix prefix toolchain-funcs virtualx
-MYP=Img-${PV}-Source
+MYP=Img-${PV}
DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${PV}/${MYP}.tar.gz
- https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.12-patchset-1.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 1-2)/${P}/${MYP}-Source.tar.gz
+ https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.14-patchset-1.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test static-libs"
RDEPEND="
@@ -33,11 +33,17 @@ DEPEND="${RDEPEND}
RESTRICT="!test? ( test )"
-S="${WORKDIR}/Img-${PV}"
+S="${WORKDIR}/${MYP}"
PATCHES=(
"${WORKDIR}"/patchset-1
- "${FILESDIR}"/${P}-test.patch
+ "${FILESDIR}"/${PN}-1.4.15-gcc11.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ stat64 # used to test for Large File Support
+ glBegin # used to test for openGL support
+ glutMainLoop # used to test for glut support
)
src_prepare() {
@@ -45,10 +51,18 @@ src_prepare() {
libjpeg/jpegtclDecls.h \
zlib/zlibtclDecls.h \
libpng/pngtclDecls.h \
+ tiff/tiffZip.c \
+ tiff/tiffPixar.c \
libtiff/tifftclDecls.h
+ # libtiff/jpeg unbundle is problematic
+ rm ../patchset-1/tkimg-1.4.12-tiff.patch || die
+ rm ../patchset-1/tkimg-1.4.10-jpeg.patch || die
+
default
+ echo "unknown" > manifest.uuid || die
+
find compat/libtiff/config -name ltmain.sh -delete || die
sed -i \
-e 's:"--with-CC=$TIFFCC"::' \
@@ -56,7 +70,7 @@ src_prepare() {
eautoreconf
for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
- ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
+ ppm ps sgi sun tga tiff window xbm xpm dted raw flir compat/libtiff ; do
(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
done
@@ -64,6 +78,15 @@ src_prepare() {
tc-export AR
}
+src_configure() {
+ default
+
+ sed -i \
+ -e "/PACKAGE_/d" \
+ libtiff/libtiff/tif_config.h \
+ || die
+}
+
src_test() {
virtx default
}
diff --git a/dev-tcltk/tkimg/tkimg-1.4.9-r1.ebuild b/dev-tcltk/tkimg/tkimg-1.4.9-r1.ebuild
deleted file mode 100644
index 6346f9299e7d..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4.9-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools edos2unix prefix toolchain-funcs
-
-MYP=Img-${PV}-Source
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${PV}/${MYP}.tar.gz
- https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.7-patchset-1.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test static-libs"
-
-RDEPEND="
- dev-lang/tk:=
- >=dev-tcltk/tcllib-1.11
- media-libs/tiff:=
- >=media-libs/libpng-1.6:=
- media-libs/libjpeg-turbo:=
- >=sys-libs/zlib-1.2.7:=
- x11-libs/libX11"
-DEPEND="${RDEPEND}
- test? (
- x11-apps/xhost
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc )"
-
-# Fails tests
-RESTRICT="test"
-
-S="${WORKDIR}/Img-${PV}"
-
-PATCHES=(
- "${WORKDIR}"/${PN}-1.4.7-tclconfig.patch
- "${WORKDIR}"/${PN}-1.4.7-jpeg.patch
- "${WORKDIR}"/${PN}-1.4.7-zlib.patch
- "${WORKDIR}"/${PN}-1.4.7-png.patch
- "${WORKDIR}"/${PN}-1.4.7-tiff.patch
- "${FILESDIR}"/${PN}-1.4-jpeg-9.patch
- "${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_prepare() {
- edos2unix \
- libjpeg/jpegtclDecls.h \
- libjpeg/Makefile.in \
- zlib/Makefile.in \
- zlib/zlibtcl.decls \
- zlib/zlibtclDecls.h \
- libpng/Makefile.in \
- libpng/pngtclDecls.h \
- libtiff/Makefile.in \
- libtiff/tifftclDecls.h \
- libtiff/tifftclStubInit.c \
- tiff/tiff.c \
- jpeg/jpeg.c
-
- default
-
- find . -name configure -delete || die
- find compat/{libjpeg,libpng,zlib,libtiff} -delete || die
-
- eautoreconf
- for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
- ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
- (cd ${dir}; eautoreconf)
- done
-
- eprefixify */*.h
- tc-export AR
-}
-
-src_install() {
- local l bl
-
- emake \
- DESTDIR="${D}" \
- INSTALL_ROOT="${D}" \
- install
-
- if ! use static-libs; then
- find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || die
- fi
-
- # Make library links
- for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
- bl=$(basename ${l})
- dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
- done
-
- dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
-
- if use doc; then
- docompress -x usr/share/doc/${PF}/demo.tcl
- dodoc demo.tcl
- docinto html
- dodoc -r doc/*
- fi
-}