From e4ad5901ca8464ae513bd315a1c0349c2bd0986c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Mar 2023 12:24:20 +0000 Subject: gentoo auto-resync : 16:03:2023 - 12:24:20 --- dev-tcltk/tkimg/Manifest | 4 +- dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch | 98 +++++++++++++------------- dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild | 2 + 3 files changed, 53 insertions(+), 51 deletions(-) (limited to 'dev-tcltk/tkimg') diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest index e7255529be46..229d01123c00 100644 --- a/dev-tcltk/tkimg/Manifest +++ b/dev-tcltk/tkimg/Manifest @@ -1,6 +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.14-gcc11.patch 2795 BLAKE2B 48d3f322def2d49ef56808e6e27e118435a5bad1141f5f667c05cc5166659e49fbcc4b0336927cc8487cf038951a4850ea94c717131e4ebd545dfb59032b1835 SHA512 11f8815ce4a8e9917ae3ce6d460195602411e01719831dd7acd43392e46873dc9e590779e740b6d74a16dc932e6a50ef830f928b13372e163c24555d7e00d413 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 @@ -9,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-r2.ebuild 2398 BLAKE2B 80275d50b4c7497046be4870014a7c3d340da30846781ce79cbc5444e5949f74a65558b7306f9d722df449cfe6eba7d9e780941071b31571dbbb7bad9657b568 SHA512 5c3f3954c69b9f8fbc6f613cfe69ce6c7e88b11b1c1b20d352451e1350325437452956530b7917116fca22cca760baf8644b8ada594a3e639d22832a9bad0c14 +EBUILD tkimg-1.4.14-r2.ebuild 2438 BLAKE2B 195f0dd01ccd930fb6d9d9c18280b3fe29fe21c49ec1ce086e75d15e34f1d1d72b2ae231e7f8afa10a5b47d68637f2db3eacf428fb373b5131ea3b2edc2443f1 SHA512 f12d5fd94ac6081b06177a1b98d3937a9e5f06454679bdf318d24692947ca826b33d6d443f77715cc19dca34e9a1aca7a8d527950ed1640e33345252e1f161d1 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 index 6f9e575db2ac..9b889315efb3 100644 --- a/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch +++ b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch @@ -16,59 +16,59 @@ --- 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" - - /* + * 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); - } - + 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 - + #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; + } + + 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; + * 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; + /* + * 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 index 904cc6621894..38c87072f7ed 100644 --- a/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild +++ b/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild @@ -51,6 +51,8 @@ src_prepare() { libjpeg/jpegtclDecls.h \ zlib/zlibtclDecls.h \ libpng/pngtclDecls.h \ + tiff/tiffZip.c \ + tiff/tiffPixar.c \ libtiff/tifftclDecls.h # libtiff unbundle is problematic -- cgit v1.2.3