From e4be1c42deab59fa5baee33fa9b1c48e5c4c6dc7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 27 Feb 2024 11:40:34 +0000 Subject: gentoo auto-resync : 27:02:2024 - 11:40:34 --- dev-tcltk/tkimg/Manifest | 11 +- dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch | 18 ---- dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch | 11 -- dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch | 11 -- dev-tcltk/tkimg/tkimg-1.4.13-r3.ebuild | 97 ----------------- dev-tcltk/tkimg/tkimg-1.4.16.ebuild | 120 +++++++++++++++++++++ dev-tcltk/tkimg/tkimg-1.4.9-r1.ebuild | 105 ------------------ 7 files changed, 122 insertions(+), 251 deletions(-) delete mode 100644 dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch delete mode 100644 dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch delete mode 100644 dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch delete mode 100644 dev-tcltk/tkimg/tkimg-1.4.13-r3.ebuild create mode 100644 dev-tcltk/tkimg/tkimg-1.4.16.ebuild delete mode 100644 dev-tcltk/tkimg/tkimg-1.4.9-r1.ebuild (limited to 'dev-tcltk/tkimg') diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest index 719aa440975f..8736874ce8dd 100644 --- a/dev-tcltk/tkimg/Manifest +++ b/dev-tcltk/tkimg/Manifest @@ -1,17 +1,10 @@ -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 2795 BLAKE2B 48d3f322def2d49ef56808e6e27e118435a5bad1141f5f667c05cc5166659e49fbcc4b0336927cc8487cf038951a4850ea94c717131e4ebd545dfb59032b1835 SHA512 11f8815ce4a8e9917ae3ce6d460195602411e01719831dd7acd43392e46873dc9e590779e740b6d74a16dc932e6a50ef830f928b13372e163c24555d7e00d413 AUX tkimg-1.4.15-gcc11.patch 210 BLAKE2B 5e7bb38fc7e1e8fb75dc5b763e867dd147be6442b0561f7d7f6c00e7e64a0ddf6a8c400deb7655bc7254acb6a6ea454160747417af232b9d988bf1d134147013 SHA512 2056c029a782f5ee582f1cf22ef6ca50ae9dc4a38693473bc84daa609113dfda859fe5aac28982efdb425e0bc4ca5be49ae30d0efeae8498d352bd80d6d8d328 -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 DIST Img-1.4.15-Source.tar.gz 12108837 BLAKE2B b423457f7edceeff38389644e206f2a96204d5f3202a5eb224d9f9a3e4fd2a031c6efb9b53ed72a53441b4d306f4bcdc3ece5d7a08b19e478ed2c74ad66d870e SHA512 f034f7b1cf8b02e0fb80f723927c8512ca67de661b21ee53ea4cf0ec8c09a151466fae0e90395f140834e46e4c231dbce8fefaf870fab41c9dd5a1995fe0d978 -DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b SHA512 c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9 -DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 3b172f4a5cae4d9ee0668957a5991317e4ae882f450335412488fd408971717facb0c1e1760dc55c20b14e315246017975699d3c1ff9968c3f8182198d85c62a SHA512 a9b9d9b7d0a1faeb7da02a5c7f2ee363e4cb68914ec5c39867ab6ee35b6df988e36d653536b48512361d3a0130c38683f72bb6a76a251820d8689398de3e73ee +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 -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 2445 BLAKE2B 412f069045ba581152106f4b4456915e8e5a163eb4b9352dde14c27cc5e0d8eca252b88bd7ba56a0a5919541215f7b63754716496105ac30bff7cbbdf44fccd1 SHA512 07aa6053f2758647062397208702a9852ae4898116766e76377b9884a36d1dda358623d9ffe64221d0eba770778e44f0c561e0e0131a856b7223782ccfaf3178 EBUILD tkimg-1.4.15.ebuild 2509 BLAKE2B 8f213dcab6e668840b2671ba7468e71a38f8676d62344b91af2a45a8a600ffd9c4837260a7d17ea0ec970c529113a41e420eabb37f905cb736faac8053d491fb SHA512 e2f767cff1bae45f4c8bf89b2866be75a32c8e0451d212a1951cff4d7fc5b796ab2253924489e5cce88af1930fd55512784f4d032429719e703a74cec7a7cd7c -EBUILD tkimg-1.4.9-r1.ebuild 2310 BLAKE2B b698928eacaba3e3ac461b6318a79f00509ac9e9af100a71babd4c061e9ae3832de972c511dab7cc3ef2e9eacd674f4a30c6faf25c092ed3b4bf9cfa767848b1 SHA512 148972819ebed0d52ec735cf851eb6d1cfc7b19881c30b989c708a0ab3bc031fefcb88fbf32ac87907200daedecba95be44c9267493605febdfe1d8295839b57 +EBUILD tkimg-1.4.16.ebuild 2509 BLAKE2B 70ebb8d9648cdc771633b5d4fbf3cd41a4be1c7b520814d765cd44b0560f1c6462ca57d0f962de743ff4c4ae25516848c71ead9562ac1203f79d40cc5d4495e2 SHA512 427c67fb3b91dd7dd5fe14154f8a4ee6c6c204be65608187e146adb0f209cf31a33932630303814d4075f27223635b140642c54c6d0e4175d306f1fb5104c511 MISC metadata.xml 329 BLAKE2B 53d89f1f85a90a476918fde2904b7be67b22b1793f8d09655b2ca18525cd9f2c49ae2848fe54b4206a49da23a9d9ab54b0750ac5437d0591c306a8311a2c945e SHA512 3a12737d8033b88e6a418f2183c8013e75777f5a15774b11d4d93b4e27360d136ad0ecfc6ff0e5d4097d669542e52e6a1d71114e4c1d1bc63ba45e0f9a0caf7e diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch b/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch deleted file mode 100644 index 23000ac7922c..000000000000 --- a/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix build with jpeg-9, bug #520886 - ---- a/jpeg/jpeg.c 2010-06-17 15:40:24.000000000 +0200 -+++ b/jpeg/jpeg.c 2018-02-07 23:26:38.050073397 +0100 -@@ -53,6 +53,13 @@ - */ - - #include "tkimg.h" -+#ifndef FALSE -+#define FALSE 0 -+#endif -+#ifndef TRUE -+#define TRUE 1 -+#endif -+#define HAVE_BOOLEAN - #include "jpegtcl.h" - - static int SetupJPegLibrary(Tcl_Interp *interp); diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch b/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch deleted file mode 100644 index 840e013b6915..000000000000 --- a/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in 2022-02-17 20:34:02.134144390 +0100 -+++ b/Makefile.in 2022-02-17 20:32:31.957625786 +0100 -@@ -109,7 +109,7 @@ - do \ - here=`pwd` && \ - cd $$sub && \ -- $(MAKE) top_builddir=$$here test || exit $$? && \ -+ $(MAKE) top_builddir=$$here libdir=.. test || exit $$? && \ - cd $$here ; \ - done - diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch b/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch deleted file mode 100644 index 307dfe314375..000000000000 --- a/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libpng/pngtclDecls.h 2020-04-13 20:16:18.542559383 +0200 -+++ b/libpng/pngtclDecls.h 2020-04-13 20:16:33.921314336 +0200 -@@ -1369,6 +1369,8 @@ - - #ifdef __cplusplus - extern "C" { -+#else -+extern - #endif - PNG_IMPEXP const PngtclStubs *pngtclStubsPtr; - #ifdef __cplusplus diff --git a/dev-tcltk/tkimg/tkimg-1.4.13-r3.ebuild b/dev-tcltk/tkimg/tkimg-1.4.13-r3.ebuild deleted file mode 100644 index fea14e66d812..000000000000 --- a/dev-tcltk/tkimg/tkimg-1.4.13-r3.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 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/${PN}-1.4.12-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}/Img-${PV}" - -PATCHES=( - "${WORKDIR}"/patchset-1 - "${FILESDIR}"/${P}-test.patch -) - -src_prepare() { - edos2unix \ - libjpeg/jpegtclDecls.h \ - zlib/zlibtclDecls.h \ - libpng/pngtclDecls.h \ - libtiff/tifftclDecls.h - - default - - 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 ; 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.16.ebuild b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild new file mode 100644 index 000000000000..314a997d59a9 --- /dev/null +++ b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools edos2unix prefix toolchain-funcs virtualx + +MYP=Img-${PV} + +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)/${P}/${MYP}-Source.tar.gz + https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.14-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}"/${PN}-1.4.15-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/jpeg unbundle is problematic + rm ../patchset-1/tkimg-1.4.12-tiff.patch || die + rm ../patchset-1/tkimg-1.4.10-jpeg.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 +} diff --git a/dev-tcltk/tkimg/tkimg-1.4.9-r1.ebuild b/dev-tcltk/tkimg/tkimg-1.4.9-r1.ebuild deleted file mode 100644 index 6346f9299e7d..000000000000 --- a/dev-tcltk/tkimg/tkimg-1.4.9-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools edos2unix prefix toolchain-funcs - -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/${PN}-1.4.7-patchset-1.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="doc test static-libs" - -RDEPEND=" - dev-lang/tk:= - >=dev-tcltk/tcllib-1.11 - media-libs/tiff:= - >=media-libs/libpng-1.6:= - media-libs/libjpeg-turbo:= - >=sys-libs/zlib-1.2.7:= - x11-libs/libX11" -DEPEND="${RDEPEND} - test? ( - x11-apps/xhost - media-fonts/font-misc-misc - media-fonts/font-cursor-misc )" - -# Fails tests -RESTRICT="test" - -S="${WORKDIR}/Img-${PV}" - -PATCHES=( - "${WORKDIR}"/${PN}-1.4.7-tclconfig.patch - "${WORKDIR}"/${PN}-1.4.7-jpeg.patch - "${WORKDIR}"/${PN}-1.4.7-zlib.patch - "${WORKDIR}"/${PN}-1.4.7-png.patch - "${WORKDIR}"/${PN}-1.4.7-tiff.patch - "${FILESDIR}"/${PN}-1.4-jpeg-9.patch - "${FILESDIR}"/${P}-fno-common.patch -) - -src_prepare() { - edos2unix \ - libjpeg/jpegtclDecls.h \ - libjpeg/Makefile.in \ - zlib/Makefile.in \ - zlib/zlibtcl.decls \ - zlib/zlibtclDecls.h \ - libpng/Makefile.in \ - libpng/pngtclDecls.h \ - libtiff/Makefile.in \ - libtiff/tifftclDecls.h \ - libtiff/tifftclStubInit.c \ - tiff/tiff.c \ - jpeg/jpeg.c - - default - - find . -name configure -delete || die - find compat/{libjpeg,libpng,zlib,libtiff} -delete || 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 ; do - (cd ${dir}; eautoreconf) - done - - eprefixify */*.h - tc-export AR -} - -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