diff options
Diffstat (limited to 'dev-tcltk')
-rw-r--r-- | dev-tcltk/Manifest.gz | bin | 5490 -> 5487 bytes | |||
-rw-r--r-- | dev-tcltk/mysqltcl/Manifest | 5 | ||||
-rw-r--r-- | dev-tcltk/mysqltcl/files/mysqltcl-3.05-API.patch | 16 | ||||
-rw-r--r-- | dev-tcltk/mysqltcl/files/mysqltcl-3.052-c23.patch | 22 | ||||
-rw-r--r-- | dev-tcltk/mysqltcl/mysqltcl-3.052-r2.ebuild | 5 |
5 files changed, 37 insertions, 11 deletions
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz Binary files differindex ac82257d7ae5..687c00535f62 100644 --- a/dev-tcltk/Manifest.gz +++ b/dev-tcltk/Manifest.gz 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 } |