From 1f048d9b860b8c7b69ac8dd085edc9ee3191b2d5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Mar 2023 00:19:47 +0000 Subject: gentoo auto-resync : 15:03:2023 - 00:19:47 --- dev-tcltk/Manifest.gz | Bin 5661 -> 5657 bytes dev-tcltk/tkimg/Manifest | 3 +- dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch | 74 ++++++++++++++++ dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild | 102 --------------------- dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild | 117 +++++++++++++++++++++++++ 5 files changed, 193 insertions(+), 103 deletions(-) create mode 100644 dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch delete mode 100644 dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild create mode 100644 dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild (limited to 'dev-tcltk') diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz index bebd00edbac8..26e7ef30de10 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 78d1a1346c61..e7255529be46 100644 --- a/dev-tcltk/tkimg/Manifest +++ b/dev-tcltk/tkimg/Manifest @@ -1,5 +1,6 @@ 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 2844 BLAKE2B 91091d5de8d5c28c065026ef9a2d1e8928d1dc6a38847bd2e641d4441df1db56a5ee099b6fd24610e6a2264c87cdfc1a07916fed6cf317e15a3ff7c5e976834a SHA512 6cdd09d78919b999f6864e6d4fa3d0a35389aab3ea47d46154ba652db26862ffe96a52b8f4aaa3849a6c0555eb7e88019b0dd2f6bb0c1247072d53950d3dbb2b 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 @@ -8,6 +9,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 2176 BLAKE2B 7a108723ea6095a056d2dda7fa1126551ca1a7e4ac28d55e9ed108d648b114c29467ed3b1d7fae96e1139d3a12858fc57dbbb0ec865970cc2b8f60a91992c155 SHA512 d0e50ac3613baa3133cf01510117c89cb002b6b2da97ddc037e340b165ae84c54c64eebb1830ef4298eb96364516f38ef304d1a0ca45a953e197658ec69b5c45 +EBUILD tkimg-1.4.14-r2.ebuild 2398 BLAKE2B 80275d50b4c7497046be4870014a7c3d340da30846781ce79cbc5444e5949f74a65558b7306f9d722df449cfe6eba7d9e780941071b31571dbbb7bad9657b568 SHA512 5c3f3954c69b9f8fbc6f613cfe69ce6c7e88b11b1c1b20d352451e1350325437452956530b7917116fca22cca760baf8644b8ada594a3e639d22832a9bad0c14 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/files/tkimg-1.4.14-gcc11.patch b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch new file mode 100644 index 000000000000..6f9e575db2ac --- /dev/null +++ b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch @@ -0,0 +1,74 @@ +--- a/libtiff/tifftclDecls.h 2023-03-14 18:53:43.978820056 +0100 ++++ b/libtiff/tifftclDecls.h 2023-03-14 18:54:32.583047764 +0100 +@@ -169,10 +169,10 @@ + TIFFTCLAPI int TIFFReadRGBATile(TIFF *tiffptr, uint32_t a, + uint32_t b, uint32_t *c); + /* 57 */ +-TIFFTCLAPI int TIFFRGBAImageOK(TIFF *tiffptr, char *a); ++TIFFTCLAPI int TIFFRGBAImageOK(TIFF *tiffptr, char a[1024]); + /* 58 */ + TIFFTCLAPI int TIFFRGBAImageBegin(TIFFRGBAImage *a, TIFF *tiffptr, +- int b, char *c); ++ int b, char c[1024]); + /* 59 */ + TIFFTCLAPI int TIFFRGBAImageGet(TIFFRGBAImage *d, uint32_t *c, + uint32_t b, uint32_t a); +--- a/tiff/tiffZip.c 2023-03-14 19:04:42.869354563 +0100 ++++ b/tiff/tiffZip.c 2023-03-14 19:05:14.768849607 +0100 +@@ -22,6 +22,7 @@ + * OF THIS SOFTWARE. + */ + ++#include + #include "tiffInt.h" + + /* +@@ -233,7 +234,7 @@ + we need to simplify this code to reflect a ZLib that is likely updated + to deal with 8byte memory sizes, though this code will respond + appropriately even before we simplify it */ +- sp->stream.avail_out = (uint64)tif->tif_rawdatasize <= 0xFFFFFFFFU ? (uInt)tif->tif_rawdatasize : 0xFFFFFFFFU; ++ sp->stream.avail_out = (uint64_t)tif->tif_rawdatasize <= 0xFFFFFFFFU ? (uInt)tif->tif_rawdatasize : 0xFFFFFFFFU; + return (deflateReset(&sp->stream) == Z_OK); + } + +--- a/tiff/tiffPixar.c 2023-03-14 20:52:33.865532115 +0100 ++++ b/tiff/tiffPixar.c 2023-03-14 20:54:14.606973646 +0100 +@@ -592,8 +592,8 @@ + #define DecoderState(tif) ((PixarLogState*) (tif)->tif_data) + #define EncoderState(tif) ((PixarLogState*) (tif)->tif_data) + +-static int PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s); +-static int PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s); ++static int PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s); ++static int PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s); + + #define PIXARLOGDATAFMT_UNKNOWN -1 + +@@ -747,7 +747,7 @@ + } + + static int +-PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s) ++PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s) + { + static const char module[] = "PixarLogDecode"; + TIFFDirectory *td = &tif->tif_dir; +@@ -1111,7 +1111,7 @@ + * Encode a chunk of pixels. + */ + static int +-PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s) ++PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s) + { + static const char module[] = "PixarLogEncode"; + TIFFDirectory *td = &tif->tif_dir; +@@ -1411,7 +1411,7 @@ + /* + * Allocate state block so tag methods have storage to record values. + */ +- tif->tif_data = (uint8_t) TkimgTIFFmalloc(sizeof (PixarLogState)); ++ tif->tif_data = (uint8_t *) TkimgTIFFmalloc(sizeof (PixarLogState)); + if (tif->tif_data == NULL) + goto bad; + sp = (PixarLogState*) tif->tif_data; diff --git a/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild b/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild deleted file mode 100644 index c92ed64bf558..000000000000 --- a/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools edos2unix prefix toolchain-funcs virtualx - -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/${P}-patchset-1.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="doc test static-libs" - -RDEPEND=" - dev-lang/tk:= - dev-tcltk/tcllib - media-libs/tiff:= - media-libs/libpng:0= - sys-libs/zlib:= - x11-libs/libX11 - media-libs/libjpeg-turbo:=" -DEPEND="${RDEPEND} - test? ( - x11-apps/xhost - media-fonts/font-misc-misc - media-fonts/font-cursor-misc )" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MYP}" - -PATCHES=( "${WORKDIR}"/patchset-1 ) - -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() { - edos2unix \ - libjpeg/jpegtclDecls.h \ - zlib/zlibtclDecls.h \ - libpng/pngtclDecls.h \ - libtiff/tifftclDecls.h - - default - - echo "unknown" > manifest.uuid || die - - find compat/libtiff/config -name ltmain.sh -delete || die - sed -i \ - -e 's:"--with-CC=$TIFFCC"::' \ - libtiff/configure.ac || 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 compat/libtiff ; do - (cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf) - done - - eprefixify */*.h - tc-export AR -} - -src_test() { - virtx default -} - -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 -} diff --git a/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild b/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild new file mode 100644 index 000000000000..904cc6621894 --- /dev/null +++ b/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools edos2unix prefix toolchain-funcs virtualx + +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/${P}-patchset-1.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" +IUSE="doc test static-libs" + +RDEPEND=" + dev-lang/tk:= + dev-tcltk/tcllib + media-libs/tiff:= + media-libs/libpng:0= + sys-libs/zlib:= + x11-libs/libX11 + media-libs/libjpeg-turbo:=" +DEPEND="${RDEPEND} + test? ( + x11-apps/xhost + media-fonts/font-misc-misc + media-fonts/font-cursor-misc )" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/${MYP}" + +PATCHES=( + "${WORKDIR}"/patchset-1 + "${FILESDIR}"/${P}-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() { + edos2unix \ + libjpeg/jpegtclDecls.h \ + zlib/zlibtclDecls.h \ + libpng/pngtclDecls.h \ + libtiff/tifftclDecls.h + + # libtiff unbundle is problematic + rm ../patchset-1/tkimg-1.4.12-tiff.patch || die + + default + + echo "unknown" > manifest.uuid || die + + find compat/libtiff/config -name ltmain.sh -delete || die + sed -i \ + -e 's:"--with-CC=$TIFFCC"::' \ + libtiff/configure.ac || 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 compat/libtiff ; do + (cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf) + done + + eprefixify */*.h + tc-export AR +} + +src_configure() { + default + + sed -i \ + -e "/PACKAGE_/d" \ + libtiff/libtiff/tif_config.h \ + || die +} + +src_test() { + virtx default +} + +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 +} -- cgit v1.2.3