commit:     1b9df78966c36c607d25f97f10fd66189d083479
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 18:26:26 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 18:28:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b9df789

dev-tcltk/tkimg: add 1.4.15

Closes: https://bugs.gentoo.org/911324
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-tcltk/tkimg/Manifest                       |   1 +
 dev-tcltk/tkimg/files/tkimg-1.4.15-gcc11.patch |  10 +++
 dev-tcltk/tkimg/tkimg-1.4.15.ebuild            | 120 +++++++++++++++++++++++++
 3 files changed, 131 insertions(+)

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 7018b4f78e30..855dd78a5a97 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,5 +1,6 @@
 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 tkimg-1.4.14-patchset-1.tar.gz 3256 BLAKE2B 
8f182365b70b4d7a3f4d9002618285b11293644755304600d302fbb8cf8945cd4bd4eb45e66ed0aec93d19e42556ef294508587f7d4e66821ad960ea5c26c7b6
 SHA512 
8c93e2b669b56ce5621a4d6d96e7412f623bd42dd777a99ec74741621a5be84f24f47149efae58baa874f49088b053b8466d16dffd79edf9594195ff41c38c0e

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.15-gcc11.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4.15-gcc11.patch
new file mode 100644
index 000000000000..72f529482709
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.15-gcc11.patch
@@ -0,0 +1,10 @@
+--- 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"
+ 
+ /*

diff --git a/dev-tcltk/tkimg/tkimg-1.4.15.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
new file mode 100644
index 000000000000..f72a321af1bd
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
@@ -0,0 +1,120 @@
+# 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/${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}"/${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/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
+}

Reply via email to