commit: 6aeb488eeb991c598145185cfeff409554509dc3 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Tue Mar 5 19:17:57 2024 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Tue Mar 5 19:18:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aeb488e
dev-tcltk/tkimg: drop 1.4.14-r2 Closes: https://bugs.gentoo.org/920481 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-tcltk/tkimg/Manifest | 1 - dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch | 74 --------------- dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild | 119 ------------------------- 3 files changed, 194 deletions(-) diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest index 7391afe1f2f9..5f8bd763509d 100644 --- a/dev-tcltk/tkimg/Manifest +++ b/dev-tcltk/tkimg/Manifest @@ -1,4 +1,3 @@ -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.16-Source.tar.gz 12129708 BLAKE2B 5da76a42a1643d759d765ade01a8a9e9782cba21d30f5ec95693364d80aca32fa54f610081833d44bf5723e6901d7577e93bd4d4285880e855e835ae6a901f4b SHA512 622549749d41c7c026053cf82b4c434602ff541b9ee7f6f15c2450fcf3cfb34eb8277432267c78adc3dcc60e53fa2d84b7cf98c5fd5a6c3cfbcf0f60746cd227 DIST tkimg-1.4.14-patchset-1.tar.gz 3256 BLAKE2B 8f182365b70b4d7a3f4d9002618285b11293644755304600d302fbb8cf8945cd4bd4eb45e66ed0aec93d19e42556ef294508587f7d4e66821ad960ea5c26c7b6 SHA512 8c93e2b669b56ce5621a4d6d96e7412f623bd42dd777a99ec74741621a5be84f24f47149efae58baa874f49088b053b8466d16dffd79edf9594195ff41c38c0e diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch deleted file mode 100644 index 9b889315efb3..000000000000 --- a/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- 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 <stdint.h> - #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-r2.ebuild b/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild deleted file mode 100644 index db2b40b81a2e..000000000000 --- a/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild +++ /dev/null @@ -1,119 +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 ~arm64 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 \ - tiff/tiffZip.c \ - tiff/tiffPixar.c \ - 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 -}
