From b8f9cc8d0880d028eb7536742f0042580b55a72e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 17 Jan 2023 23:55:47 +0000 Subject: gentoo auto-resync : 17:01:2023 - 23:55:47 --- dev-tcltk/Manifest.gz | Bin 5810 -> 5814 bytes dev-tcltk/tkimg/Manifest | 2 +- dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild | 4 +- dev-tcltk/tktable/Manifest | 3 + dev-tcltk/tktable/files/tktable-2.10-clang6.patch | 80 +++++++++++++++++++++ .../tktable/files/tktable-2.10-parallelMake.patch | 12 ++++ dev-tcltk/tktable/tktable-2.10-r2.ebuild | 34 +++++++++ dev-tcltk/tkzinc/Manifest | 3 +- dev-tcltk/tkzinc/files/tkzinc-3.3.6-clang.patch | 29 ++++++++ dev-tcltk/tkzinc/tkzinc-3.3.6-r1.ebuild | 5 +- 10 files changed, 166 insertions(+), 6 deletions(-) create mode 100644 dev-tcltk/tktable/files/tktable-2.10-clang6.patch create mode 100644 dev-tcltk/tktable/files/tktable-2.10-parallelMake.patch create mode 100644 dev-tcltk/tktable/tktable-2.10-r2.ebuild create mode 100644 dev-tcltk/tkzinc/files/tkzinc-3.3.6-clang.patch (limited to 'dev-tcltk') diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz index 5b600d405092..88d8290d5d61 100644 Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest index f1969c078f2c..77800fa1ca17 100644 --- a/dev-tcltk/tkimg/Manifest +++ b/dev-tcltk/tkimg/Manifest @@ -8,6 +8,6 @@ DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 3b172f4a5cae4d9ee0668957a599131 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-r1.ebuild 1999 BLAKE2B 9f5f29df4a858f28c4ea4e4ea513cab09ca05c8d86a3677ab8c0827a6c32148c42da6d1fc5e5822fe22d45099a9e297e7ad2b46e7566a190041a635a15bb8649 SHA512 4d500b656bc7917797196c108928db6bb0b7e3445b77a7163782e12969a1c8462647a85cec720af4160fc3225791ce3269080c4e5c1b49f4f53a80ec9d01ac72 +EBUILD tkimg-1.4.14-r1.ebuild 2013 BLAKE2B 80910ccbd5c50e2cdb8fd4eee1998aa39999970e7163f3fd2962722e7fbe5e84253b04ef6e6ec5187129aa0e9631dd5043c304c250c9a3797205f976c89e06c5 SHA512 14c59b9dacda24a23cba6380425f0ad312586db6015360d5fb229b3d8295a6ea818e715a8765294665ff5a147494d9ebba222ad6ee2dcf149d91cd978314a447 EBUILD tkimg-1.4.9-r1.ebuild 2310 BLAKE2B b698928eacaba3e3ac461b6318a79f00509ac9e9af100a71babd4c061e9ae3832de972c511dab7cc3ef2e9eacd674f4a30c6faf25c092ed3b4bf9cfa767848b1 SHA512 148972819ebed0d52ec735cf851eb6d1cfc7b19881c30b989c708a0ab3bc031fefcb88fbf32ac87907200daedecba95be44c9267493605febdfe1d8295839b57 MISC metadata.xml 329 BLAKE2B 53d89f1f85a90a476918fde2904b7be67b22b1793f8d09655b2ca18525cd9f2c49ae2848fe54b4206a49da23a9d9ab54b0750ac5437d0591c306a8311a2c945e SHA512 3a12737d8033b88e6a418f2183c8013e75777f5a15774b11d4d93b4e27360d136ad0ecfc6ff0e5d4097d669542e52e6a1d71114e4c1d1bc63ba45e0f9a0caf7e diff --git a/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild b/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild index fcbe6aadd947..ba356225e0c5 100644 --- a/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild +++ b/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${PV}/${MYP}.ta LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="doc test static-libs" RDEPEND=" @@ -55,7 +55,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 diff --git a/dev-tcltk/tktable/Manifest b/dev-tcltk/tktable/Manifest index 1db2165d5a53..04b265e8842d 100644 --- a/dev-tcltk/tktable/Manifest +++ b/dev-tcltk/tktable/Manifest @@ -1,3 +1,6 @@ +AUX tktable-2.10-clang6.patch 3234 BLAKE2B d74fee13f1a1be1038870be73e1ef84a1ce09a1604098f6e701441a5650aeeb8354acd78612bdcf1e55308b539bb7574a5fddb2a31152aa0a2412d763da14417 SHA512 6887ce462df67cc470873fffc31fbc411c0218e6974d13f24c6a9355d5eb665f374f8883670e057b26adbe4c00394353c54670e836ffec5340656c1159865a66 +AUX tktable-2.10-parallelMake.patch 505 BLAKE2B d43564e6a93a450c03e699b82d5e8b63eecc0cc1895ff673074c2317e4a6217cf44124e626bca5061bc4c13078e86297899c655ec86e515975ec00b6217f112c SHA512 d59d664e5719949d683245773dded610857e8b057e13b6353dca0c800e16869822b3c7fb8f365af6e72496023bc51e0f555e5e0f0739bc386bd1d73015cfbc6f DIST Tktable2.10.tar.gz 284135 BLAKE2B ff3a37aac53418e7993a310d38ae23b7ec2673e0b44c118ff558a6c3c3805b39bf77f099287e91298fb4a6afacebde68a09171c6b90ecd11f48ac2a33fa3b312 SHA512 d69b1c766abb2833f48c900ca4d4fd3927f138ddf728dd76f2087a784604daa4356ec60a146e71d2fb2508a644598711e0373cb81dbfb0272b7ad16a0754e899 +EBUILD tktable-2.10-r2.ebuild 691 BLAKE2B 6bfb0eb062267c401fbdda1d494190a98599f247c5f372f745ac90543d17ec960e38b0aa91eb1c16166d9a0bd53f921dfbfe6525ca481358627e1e89084ac287 SHA512 eac23cb0883f89ecbd61d1624e3082e091893be367f2f81f9ee04fa3f4a618f063fd796b1ba82345d87c3750c6e0ab05931b29baedb598bdfa81d21b838d6cd8 EBUILD tktable-2.10.ebuild 606 BLAKE2B 760c66c6448bfa3513db5141727ac214f122aa21eaf8b215bec47e66b39fa29db31d7f472729880d9a6574509c6c624d45085ea3056e720ef4b81f15874e1e61 SHA512 37f3e2767a34a5973dd34d8d982cceae210efe122544cd20a6c7e2436a1d6faa4c7af9371c918841282f03dd9a7720c55d85e93f676fab1a6e02a36309bbae97 MISC metadata.xml 331 BLAKE2B 504e2ba54132ff08d8579e312e78901689a18eee59cea5f008dc21b8d613bc6c67938849ad030d5844126871d4cafe86060a43f5460d3be1148c83b51a685219 SHA512 4584fa5d9d9b9739e881354c96e0b099c037b2faa0ee7d3d1f3e87c30348b347e2a8a61cc1264f1b62e1a5b8bd2bdcf32ae0895a9ab8dfe588c5a8bfc1d9613c diff --git a/dev-tcltk/tktable/files/tktable-2.10-clang6.patch b/dev-tcltk/tktable/files/tktable-2.10-clang6.patch new file mode 100644 index 000000000000..af5eea359442 --- /dev/null +++ b/dev-tcltk/tktable/files/tktable-2.10-clang6.patch @@ -0,0 +1,80 @@ +--- a/generic/tkTable.h 2023-01-17 21:57:06.986859146 +0100 ++++ b/generic/tkTable.h 2023-01-17 21:59:18.730802234 +0100 +@@ -526,7 +526,7 @@ + extern int TableOptionBdSet(ClientData clientData, + Tcl_Interp *interp, Tk_Window tkwin, + CONST84 char *value, char *widgRec, int offset); +-extern char * TableOptionBdGet(ClientData clientData, ++extern const char *TableOptionBdGet(ClientData clientData, + Tk_Window tkwin, char *widgRec, int offset, + Tcl_FreeProc **freeProcPtr); + extern int TableTagConfigureBd(Table *tablePtr, +@@ -535,7 +535,7 @@ + Tcl_Interp *interp, + Tk_Window unused, CONST84 char *value, + char *widgRec, int offset); +-extern char * Cmd_OptionGet(ClientData clientData, ++extern const char *Cmd_OptionGet(ClientData clientData, + Tk_Window unused, char *widgRec, + int offset, Tcl_FreeProc **freeProcPtr); + +--- a/generic/tkTableWin.c 2023-01-17 22:09:00.225476183 +0100 ++++ b/generic/tkTableWin.c 2023-01-17 22:02:24.739108283 +0100 +@@ -17,7 +17,7 @@ + static int StickyParseProc _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, Tk_Window tkwin, + CONST84 char *value, char *widgRec, int offset)); +-static char * StickyPrintProc _ANSI_ARGS_((ClientData clientData, ++static const char *StickyPrintProc _ANSI_ARGS_((ClientData clientData, + Tk_Window tkwin, char *widgRec, int offset, + Tcl_FreeProc **freeProcPtr)); + +@@ -117,7 +117,7 @@ + * + *---------------------------------------------------------------------- + */ +-static char * ++static const char * + StickyPrintProc(clientData, tkwin, widgRec, offset, freeProcPtr) + ClientData clientData; /* Ignored. */ + Tk_Window tkwin; /* Window for text widget. */ +--- a/generic/tkTableTag.c 2023-01-17 22:12:25.754449096 +0100 ++++ b/generic/tkTableTag.c 2023-01-17 22:12:49.819092428 +0100 +@@ -22,7 +22,7 @@ + static int TableOptionReliefSet _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, Tk_Window tkwin, + CONST84 char *value, char *widgRec, int offset)); +-static char * TableOptionReliefGet _ANSI_ARGS_((ClientData clientData, ++static const char *TableOptionReliefGet _ANSI_ARGS_((ClientData clientData, + Tk_Window tkwin, char *widgRec, int offset, + Tcl_FreeProc **freeProcPtr)); + +@@ -1340,7 +1340,7 @@ + *---------------------------------------------------------------------- + */ + +-static char * ++static const char * + TableOptionReliefGet(clientData, tkwin, widgRec, offset, freeProcPtr) + ClientData clientData; /* Type of struct being set. */ + Tk_Window tkwin; /* Window containing canvas widget. */ +--- a/generic/tkTableUtil.c 2023-01-17 22:13:28.610516868 +0100 ++++ b/generic/tkTableUtil.c 2023-01-17 22:14:07.003963494 +0100 +@@ -169,7 +169,7 @@ + *---------------------------------------------------------------------- + */ + +-char * ++const char * + TableOptionBdGet(clientData, tkwin, widgRec, offset, freeProcPtr) + ClientData clientData; /* Type of struct being set. */ + Tk_Window tkwin; /* Window containing canvas widget. */ +@@ -329,7 +329,7 @@ + *---------------------------------------------------------------------- + */ + +-char * ++const char * + Cmd_OptionGet(ClientData clientData, Tk_Window unused, + char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) + { diff --git a/dev-tcltk/tktable/files/tktable-2.10-parallelMake.patch b/dev-tcltk/tktable/files/tktable-2.10-parallelMake.patch new file mode 100644 index 000000000000..534a0a83b901 --- /dev/null +++ b/dev-tcltk/tktable/files/tktable-2.10-parallelMake.patch @@ -0,0 +1,12 @@ +--- a/Makefile.in 2023-01-17 21:41:13.532754760 +0100 ++++ b/Makefile.in 2023-01-17 21:41:35.153416999 +0100 +@@ -189,7 +189,8 @@ + # for the BINARIES that you specified above have already been done. + #======================================================================== + +-all: binaries libraries doc ++all: tkTable.tcl.h ++ $(MAKE) binaries libraries doc + + #======================================================================== + # The binaries target builds executable programs, Windows .dll's, unix diff --git a/dev-tcltk/tktable/tktable-2.10-r2.ebuild b/dev-tcltk/tktable/tktable-2.10-r2.ebuild new file mode 100644 index 000000000000..d2bfcfa012d0 --- /dev/null +++ b/dev-tcltk/tktable/tktable-2.10-r2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="Tktable${PV}" + +DESCRIPTION="full-featured 2D table widget" +HOMEPAGE="http://tktable.sourceforge.net/" +SRC_URI="mirror://sourceforge/tktable/${MY_P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="amd64 ppc x86" +SLOT="0" +IUSE="" + +DEPEND=">=dev-lang/tk-8.0:=" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${MY_P} + +HTML_DOCS=( doc/tkTable.html ) +DOCS=( ChangeLog README.txt release.txt ) + +PATCHES=( + "${FILESDIR}"/${P}-parallelMake.patch + "${FILESDIR}"/${P}-clang6.patch +) + +src_prepare() { + default + sed -e '/^install:/{s: install-doc::}' \ + -e '/^PKG_EXTRA_FILES/{s:=.*:=:}' -i Makefile.in || die +} diff --git a/dev-tcltk/tkzinc/Manifest b/dev-tcltk/tkzinc/Manifest index d38ba32a0c03..7218e5908d9a 100644 --- a/dev-tcltk/tkzinc/Manifest +++ b/dev-tcltk/tkzinc/Manifest @@ -1,5 +1,6 @@ AUX 3.3.6-ldflags.patch 552 BLAKE2B ebd7496be2a97cf7325d25a46e272fe287e7bd17d7e8c660f584609057ba6823b75bfbcc611178fa70a66b90d2a699d41b7e6b673ded23db188bba47ecd4d11d SHA512 5ef1d02ac3b6eaffc4c7310e80e27204c5eb0ccc9d6627a5da4598a6b13d20fa1a1eab63194578a56a0650eb07c70879370e64030ccf86caf5226a1d1c6fea7e AUX tkzinc-3.3.4-latex.patch 254 BLAKE2B 23b996d25c762c9598af86182a2aed1b13638183144d893ccbdc02ef1215f32041c161636dcf894e97720c0b41a94c7bf105c8b1dac0406a8fd68506ca03b9f0 SHA512 032ab424273f6b69fbbec3e2d028ca054e11bd49b7cb119756ba495edd81eba9e005d55d60bb5b759766c07c013d21a4d99b99137b3cb16d00be816168699d40 +AUX tkzinc-3.3.6-clang.patch 612 BLAKE2B 94c8ff62e15df73460c395174b848faaa848c5e96e880f833a7d10168880a6c7a6a32618d6a2aeebb397b6468d61e3fcc433348882c844f7f257d91379abdee1 SHA512 351a11fafad093195d74923f927f9ebe65e64137a9a5ec199d439283c342d9cf27cd467c07327d93c898bff80b708ad811561789548b6138f91ae078e5d0b4d7 DIST Tkzinc-3.3.6plus.tar.gz 1924729 BLAKE2B 9e02b113c37cfb870b2e238591e9b35cf5851c6534249312118c54d179d9ba7dbca17217cd924cfcfb1ef2444697840e3136d0fd1385b976a8a2bfda156c488d SHA512 ead998b69569ebec92e7f60415296262f60b91250b2fe15fdeb9fb71c38756006bedcd9ed2829d915cb6ce3a6461165a48c9037f8e397ba6049a76ae474f7838 -EBUILD tkzinc-3.3.6-r1.ebuild 962 BLAKE2B a94760e526f7ff1579e874924b2a66f3bb4cc0b996f2fc81052b56d26f3f9e94142c44517bcecc5a822c92867e7da51d62cd88a678762f06ab17f99cc506d1d0 SHA512 f867d9e31d72d070bbfe3aced62f100a4b8fb5da77e3f3edcd77d0aae2f3987a55858f0c1bc3e972fe4c152a78db5539e599a89fa6dbdc10789e0484d900a2cb +EBUILD tkzinc-3.3.6-r1.ebuild 993 BLAKE2B 6ee0f88bb5b5488774aad88034aeeedc3e1c624a6bc2e767bf3e2b583fa5782f77229fde9182b00a966c7b31ac48a4fba7b9776fd4e9019f31618c341c181dd1 SHA512 492ea255324398adc03350ffc0ea1f8f02e08a80fdba3f39057b42fb919aada1fb372f5414d556c61b9fca81f06d24c41edd15f8bede1443675fc9d26cb186d0 MISC metadata.xml 254 BLAKE2B 9573404fa3a0c7ca69eb6a410ebc3e834700d2e2cad03ab584e919f1c00e6fa68c902d2239fe5ece779dce9da9922b2867d201d11312702561166cbb3bc2f19e SHA512 b2480af89acd36bfbdf6af850f846b3e95ab8a9354882048948812ff79c6066a33fcc4c2d32cfe1c8db005f6d0ef2f51f813ab2ecefe207083412498943d433a diff --git a/dev-tcltk/tkzinc/files/tkzinc-3.3.6-clang.patch b/dev-tcltk/tkzinc/files/tkzinc-3.3.6-clang.patch new file mode 100644 index 000000000000..e8bdb40b6083 --- /dev/null +++ b/dev-tcltk/tkzinc/files/tkzinc-3.3.6-clang.patch @@ -0,0 +1,29 @@ +--- a/generic/Window.c 2023-01-17 19:39:55.697886490 +0100 ++++ b/generic/Window.c 2023-01-17 19:41:15.619618094 +0100 +@@ -350,7 +350,7 @@ + #endif /* ifdef _WIN32 */ + + /* Reset externalwindow */ +- wind->externalwindow = NULL; ++ wind->externalwindow = 0; + } + + +@@ -384,7 +384,7 @@ + wind->connection_anchor = TK_ANCHOR_SW; + wind->win = NULL; + wind->windowtitle = NULL; +- wind->externalwindow = NULL; ++ wind->externalwindow = 0; + + return TCL_OK; + } +@@ -407,7 +407,7 @@ + */ + wind->win = NULL; + wind->windowtitle = NULL; +- wind->externalwindow = NULL; ++ wind->externalwindow = 0; + } + + diff --git a/dev-tcltk/tkzinc/tkzinc-3.3.6-r1.ebuild b/dev-tcltk/tkzinc/tkzinc-3.3.6-r1.ebuild index a94dde7d11fe..c7fa5fd154eb 100644 --- a/dev-tcltk/tkzinc/tkzinc-3.3.6-r1.ebuild +++ b/dev-tcltk/tkzinc/tkzinc-3.3.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,7 +26,8 @@ S="${WORKDIR}/Tkzinc-${PV//.}+" PATCHES=( "${FILESDIR}"/${PV}-ldflags.patch "${FILESDIR}"/${PN}-3.3.4-latex.patch - ) + "${FILESDIR}"/${P}-clang.patch +) HTML_DOCS='doc/*png doc/*html doc/*css' -- cgit v1.2.3