summaryrefslogtreecommitdiff
path: root/dev-tcltk
diff options
context:
space:
mode:
Diffstat (limited to 'dev-tcltk')
-rw-r--r--dev-tcltk/Manifest.gzbin5488 -> 5487 bytes
-rw-r--r--dev-tcltk/mysqltcl/Manifest5
-rw-r--r--dev-tcltk/mysqltcl/files/mysqltcl-3.05-API.patch16
-rw-r--r--dev-tcltk/mysqltcl/files/mysqltcl-3.052-c23.patch22
-rw-r--r--dev-tcltk/mysqltcl/mysqltcl-3.052-r2.ebuild5
-rw-r--r--dev-tcltk/tktable/Manifest3
-rw-r--r--dev-tcltk/tktable/files/tktable-2.10.8-nobool.patch39
-rw-r--r--dev-tcltk/tktable/tktable-2.10.8.ebuild5
8 files changed, 81 insertions, 14 deletions
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 387c3d095eb4..687c00535f62 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
Binary files differ
diff --git a/dev-tcltk/mysqltcl/Manifest b/dev-tcltk/mysqltcl/Manifest
index ff636bb028a0..5a4e13f01925 100644
--- a/dev-tcltk/mysqltcl/Manifest
+++ b/dev-tcltk/mysqltcl/Manifest
@@ -1,5 +1,6 @@
-AUX mysqltcl-3.05-API.patch 427 BLAKE2B a204b1d9895898ccfd7c409464aa092deef29742a613991bb71ef112e28049aa282d25f918ed97f45f8909d8cf01824526e6ce218cef646258c4011f6d7127ae SHA512 9dbd032ed6f66cf265fbcdaa0985af80015b6012407bb4364a02b6f4f07375bc69214348cfcf27270b14bc6ca79fdfad2e21b1a05012b606ffb931d57e6d52bb
+AUX mysqltcl-3.05-API.patch 419 BLAKE2B c1871aba57ec85b9489fdb6c121fe26cdcc0a5956349b8a29782fbfb7cd7f6409d9c7c57a69347a5d2a949fe65c629af29c6cc28318790dbbb6f94a95b32c732 SHA512 84204a9c8207342287862287040d5efb9c583e217cb079b205cd522a760caf2bce8a72f2bc1c0d616c32ab495ee7c8da2830fa29f34f50a5f5ceb268ab16d32f
AUX mysqltcl-3.05-ldflags.patch 448 BLAKE2B 7c0bb9294a96c870ffe4ecd0d3f401936695221fceee5a7a2b43aec8097a09849f8daf3e33e987a1492fb34f7c67a7aba5fe8ad3ef9bf2aabcc91c1f39f08315 SHA512 c253797952c5abe6633e9eb1394a1e5c2d6bd88f3c74f5f367a139b6de71fb22a645717c86d0d61a68b33a01240940e0347d184623ed1b889defea58c3c8ee79
+AUX mysqltcl-3.052-c23.patch 558 BLAKE2B 0a838102c729fd938fd576b21b51b07d154e4aee7fe08722fdd92334b08eef39074e0e4102bcc5a1ac781ef57f21a35a3bac43fda3fdc74da7c78914be7683f9 SHA512 9e842d81a3bc89afde2ec8e0463af0737053bf3ff1684a8ade316506f05bcad52414e80176f9ce01849c96a76e1fab921989ad968aef31b4eeb8d0094ab4217a
DIST mysqltcl-3.052.tar.gz 187781 BLAKE2B 0fe9b145556de22364187de980d737cae99a5a18763b1e3b28e4aa849f7b0b30be543cfa956c37b15e756f75ec5804e92b8b452410d542c3c3390e52d88d0419 SHA512 f5af18ad9bbaedb1fdcdbaa326b5c4cc3f754b14ee9bdf9cbfa0e1a44227ec918426022aaa0f26a71fa1a3bce6b6d8d75f8612de7f540f287fd418088c91fddf
-EBUILD mysqltcl-3.052-r2.ebuild 768 BLAKE2B 76391f2cfc1fc71f923880161503a4271aeb2e69e53941194a8bbd3de3cdc1d1bbe4842644e9e6d9a5e64b4dba3b45f26ecab20d31a5a058f4a5a8295ea3e4f5 SHA512 4405b6d3b73d425bf3c8c944fa2b849fa936e7f6684a82a11d8c1706479fcae3d19fb77949d140aea5e7018e0197b51e08ca5697be24910fd1671f8382b768d2
+EBUILD mysqltcl-3.052-r2.ebuild 846 BLAKE2B 781d08309112f05b1068b7b5065f48239bd25cc97c6d00b4816063dce55a461f806471cc4307ec918f0b72d7c37daa29bd5bc4a02e221664f3c1fbe3ad6fe6e9 SHA512 c3fb18f439f200b20cec27552b52f97acc62db6decf59f7bebb514982e34c78f3f833a25b3329b1f66e8ea3e6b524df978660b1dbb10449b96469fe50e92c75f
MISC metadata.xml 250 BLAKE2B f1a89a42f9941c35d4c33e6b1ca5be829cac098278d63286f933d991b1d607e0b36dc7b8f0df39c6dce626aae579f7b1a83c37a1e6a72d02904ecc9a15e5783d SHA512 7468dbefac3a8c659585848363487988f297e7e8f29c7aa866cae9099f1828b2a7a45387df2e2a7d284f1f0b5c239de49b7610dbad7a3e63efba529cd48388a5
diff --git a/dev-tcltk/mysqltcl/files/mysqltcl-3.05-API.patch b/dev-tcltk/mysqltcl/files/mysqltcl-3.05-API.patch
index f28f044f850f..579057268889 100644
--- a/dev-tcltk/mysqltcl/files/mysqltcl-3.05-API.patch
+++ b/dev-tcltk/mysqltcl/files/mysqltcl-3.05-API.patch
@@ -1,11 +1,11 @@
--- a/generic/mysqltcl.c 2022-12-24 18:24:12.451620838 +0100
+++ b/generic/mysqltcl.c 2022-12-24 18:24:24.075438534 +0100
@@ -911,7 +911,7 @@
- #if (MYSQL_VERSION_ID>=32350)
- if(mysql_options_reconnect)
- {
-- my_bool reconnect = 1;
-+ bool reconnect = 1;
- mysql_options(handle->connection, MYSQL_OPT_RECONNECT, &reconnect);
- }
- mysql_options(handle->connection,MYSQL_READ_DEFAULT_GROUP,groupname);
+ #if (MYSQL_VERSION_ID>=32350)
+ if(mysql_options_reconnect)
+ {
+- my_bool reconnect = 1;
++ bool reconnect = 1;
+ mysql_options(handle->connection, MYSQL_OPT_RECONNECT, &reconnect);
+ }
+ mysql_options(handle->connection,MYSQL_READ_DEFAULT_GROUP,groupname);
diff --git a/dev-tcltk/mysqltcl/files/mysqltcl-3.052-c23.patch b/dev-tcltk/mysqltcl/files/mysqltcl-3.052-c23.patch
new file mode 100644
index 000000000000..df66202afa25
--- /dev/null
+++ b/dev-tcltk/mysqltcl/files/mysqltcl-3.052-c23.patch
@@ -0,0 +1,22 @@
+--- a/generic/mysqltcl.c 2025-04-06 09:16:50.402168333 +0200
++++ b/generic/mysqltcl.c 2025-04-06 09:17:26.718696196 +0200
+@@ -2642,8 +2642,7 @@
+ #ifdef _WINDOWS
+ __declspec( dllexport )
+ #endif
+-int Mysqltcl_Init(interp)
+- Tcl_Interp *interp;
++int Mysqltcl_Init(Tcl_Interp *interp)
+ {
+ char nbuf[MYSQL_SMALL_SIZE];
+ MysqltclState *statePtr;
+@@ -2763,8 +2762,7 @@
+ #ifdef _WINDOWS
+ __declspec( dllexport )
+ #endif
+-int Mysqltcl_SafeInit(interp)
+- Tcl_Interp *interp;
++int Mysqltcl_SafeInit(Tcl_Interp *interp)
+ {
+ return Mysqltcl_Init(interp);
+ }
diff --git a/dev-tcltk/mysqltcl/mysqltcl-3.052-r2.ebuild b/dev-tcltk/mysqltcl/mysqltcl-3.052-r2.ebuild
index 8edd7cfe8c16..8f62aa1bee67 100644
--- a/dev-tcltk/mysqltcl/mysqltcl-3.052-r2.ebuild
+++ b/dev-tcltk/mysqltcl/mysqltcl-3.052-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+inherit edos2unix
DESCRIPTION="TCL MySQL Interface"
HOMEPAGE="http://www.xdobry.de/mysqltcl/"
@@ -23,10 +24,12 @@ QA_CONFIG_IMPL_DECL_SKIP=(
PATCHES=(
"${FILESDIR}"/${PN}-3.05-ldflags.patch
"${FILESDIR}"/${PN}-3.05-API.patch
+ "${FILESDIR}"/${P}-c23.patch
)
HTML_DOCS=( doc/mysqltcl.html )
src_prepare() {
+ edos2unix generic/mysqltcl.c
default_src_prepare
sed -i 's/-pipe//g;s/-O2//g;s/-fomit-frame-pointer//g' configure || die
}
diff --git a/dev-tcltk/tktable/Manifest b/dev-tcltk/tktable/Manifest
index b63508b48c02..a3069356d498 100644
--- a/dev-tcltk/tktable/Manifest
+++ b/dev-tcltk/tktable/Manifest
@@ -1,8 +1,9 @@
AUX tktable-2.10-clang6.patch 3234 BLAKE2B d74fee13f1a1be1038870be73e1ef84a1ce09a1604098f6e701441a5650aeeb8354acd78612bdcf1e55308b539bb7574a5fddb2a31152aa0a2412d763da14417 SHA512 6887ce462df67cc470873fffc31fbc411c0218e6974d13f24c6a9355d5eb665f374f8883670e057b26adbe4c00394353c54670e836ffec5340656c1159865a66
AUX tktable-2.10-parallelMake.patch 505 BLAKE2B d43564e6a93a450c03e699b82d5e8b63eecc0cc1895ff673074c2317e4a6217cf44124e626bca5061bc4c13078e86297899c655ec86e515975ec00b6217f112c SHA512 d59d664e5719949d683245773dded610857e8b057e13b6353dca0c800e16869822b3c7fb8f365af6e72496023bc51e0f555e5e0f0739bc386bd1d73015cfbc6f
AUX tktable-2.10.8-clang6.patch 875 BLAKE2B 919ad13b0427940bbe72a26f4bb5817806e80f40edc2f7def629765136944e159f3b2964e3aa0257b6c3ebd238b5267a041779d9dc02f3b81c6529d4867f285e SHA512 2902ff98f8f08f13e66d750bea5f86afe49ebe8d11e12f062c6dc17647df9398ba0231b3a78db2ce05512886698e9857bd9dfb7e3893b8504070957036b2b725
+AUX tktable-2.10.8-nobool.patch 1343 BLAKE2B 4ddf5ece0213a6ca4637304b7f3d61c02fe21788ab1a599bf2bd7b1483d5193fa4d17e17d94d991b18305d3c781293134fc4693867a3deba49215faf8fbf08bb SHA512 33697dc242f3deaca32e45528aa20b98c0dfe7a372540ba555a1d6164f0e2c29131a40ce2f5524b125d95644f1b731d8e6a03cd9bd1fb5c65222282e64eb7ca2
DIST Tktable2.10.tar.gz 284135 BLAKE2B ff3a37aac53418e7993a310d38ae23b7ec2673e0b44c118ff558a6c3c3805b39bf77f099287e91298fb4a6afacebde68a09171c6b90ecd11f48ac2a33fa3b312 SHA512 d69b1c766abb2833f48c900ca4d4fd3927f138ddf728dd76f2087a784604daa4356ec60a146e71d2fb2508a644598711e0373cb81dbfb0272b7ad16a0754e899
DIST tktable-2.10.8.tar.gz 308245 BLAKE2B 4ede838e8553244dabd71d9543094bf5dfc82bd74f31ac9b4d4eea7bb2ee7406d90b16198d700eddfccd236160be1b7ed9a1f72f4760a71cddde5e01927ebb42 SHA512 927dad616306f0af477d1ce801ded962d966f7b46904b0a6b6772d1c9140310ff4c93a90ad4cb228495febae8be5f3ded9a328f621ba34195a339fc29d000f04
EBUILD tktable-2.10-r2.ebuild 696 BLAKE2B 3a0b55bc72e5ebd463db05a8ed0b5b1ec3d56ac85b11f61ccc832a9376d6e3c48e840ad08644bff4a768fb2388f89a60ee73cdd105a0c6e65f6b9c2aa7e1c721 SHA512 9bc6b04e2758792d68c08388328e19212569a2ae71965cfc243b38eb37c17121e8b2dbf97dfee3a2a160e886437db784b72982701548e2466e68704c1a4a1519
-EBUILD tktable-2.10.8.ebuild 790 BLAKE2B 653350e059213ce0e0b9a245665002663770f49d7e9feb2625fd0dc3f3bac3fcccbc49e632570abc98b51fec4313589874f8dd501201579b4280f31648734fd0 SHA512 a3313009c849e17d2fcf63c64b49e190a128cec53763321a2ca65821aeb570770d572521f9eaeee8ea3232e84c329919a122fbcf2674757c837122cffdde489b
+EBUILD tktable-2.10.8.ebuild 823 BLAKE2B 0eba3647d82a3027dcb662bbd49ca9f3912b5ac090ebac78ff67d6a14bacb758f94636d8dabe52d45e5904d93321efb0de6bebead223575de7a3b21055ad7a2a SHA512 a2a98d074457af19fa3b8c0f2d57579132d1d8a98275f533bd0fcbaf3c99e6e0fa52f28622d359c8241ff9516b7881b7011eb8653e1bfe91fa11fb3372174268
MISC metadata.xml 384 BLAKE2B 4826a9a23f5810e2f88f1921240131b66e452ddd2f8ff22fd7a607825b2427210708a8df21270404af552636539333bf4388cac554d45a7fe0bceddaad278637 SHA512 cbc92dd70f46bc728a6f1d793d1ca33f9b186ae2e115944a3d263ce5f8007971037f67c3f5393dc84b239dda0750276d5834e7c70ffd6d6e03c0e9da935ee6aa
diff --git a/dev-tcltk/tktable/files/tktable-2.10.8-nobool.patch b/dev-tcltk/tktable/files/tktable-2.10.8-nobool.patch
new file mode 100644
index 000000000000..f9ff321bcdcf
--- /dev/null
+++ b/dev-tcltk/tktable/files/tktable-2.10.8-nobool.patch
@@ -0,0 +1,39 @@
+From 78fdd693c43aec8595b6b8b122bd1dede218f85e Mon Sep 17 00:00:00 2001
+From: Christian Werner <chw@ch-werner.de>
+Date: Wed, 10 Jun 2020 01:12:58 +0000
+Subject: [PATCH] Do not use bool as variable name in tktable
+
+Imported from http://www.androwish.org/home/info/f2bd6de01c438a20
+---
+ generic/tkTable.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/generic/tkTable.c b/generic/tkTable.c
+index 2cb084a..4d89b3a 100644
+--- a/generic/tkTable.c
++++ b/generic/tkTable.c
+@@ -3843,7 +3843,7 @@ TableValidateChange(tablePtr, r, c, old, new, index)
+ int index; /* index of insert/delete, -1 otherwise */
+ {
+ register Tcl_Interp *interp = tablePtr->interp;
+- int code, bool;
++ int code, flag;
+ Tk_RestrictProc *rstrct;
+ ClientData cdata;
+ Tcl_DString script;
+@@ -3884,13 +3884,13 @@ TableValidateChange(tablePtr, r, c, old, new, index)
+ Tcl_BackgroundError(interp);
+ code = TCL_ERROR;
+ } else if (Tcl_GetBooleanFromObj(interp, Tcl_GetObjResult(interp),
+- &bool) != TCL_OK) {
++ &flag) != TCL_OK) {
+ Tcl_AddErrorInfo(interp,
+ "\n\tboolean not returned by validation command");
+ Tcl_BackgroundError(interp);
+ code = TCL_ERROR;
+ } else {
+- code = (bool) ? TCL_OK : TCL_BREAK;
++ code = (flag) ? TCL_OK : TCL_BREAK;
+ }
+ Tcl_SetObjResult(interp, Tcl_NewObj());
+
diff --git a/dev-tcltk/tktable/tktable-2.10.8.ebuild b/dev-tcltk/tktable/tktable-2.10.8.ebuild
index 2215efce4811..238c52d64ebc 100644
--- a/dev-tcltk/tktable/tktable-2.10.8.ebuild
+++ b/dev-tcltk/tktable/tktable-2.10.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,8 +9,8 @@ SRC_URI="https://github.com/wjoye/${PN}/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="amd64 ~arm64 ppc x86"
SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc x86"
RESTRICT="test"
DEPEND=">=dev-lang/tk-8.0:="
@@ -26,6 +26,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
PATCHES=(
"${FILESDIR}"/${PN}-2.10-parallelMake.patch
"${FILESDIR}"/${P}-clang6.patch
+ "${FILESDIR}"/${P}-nobool.patch
)
src_prepare() {
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-21 01:12:45 +0000