From bed152ba1fc2f1316eaefb5c3d24d48195560f76 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Nov 2022 07:07:57 +0000 Subject: gentoo auto-resync : 23:11:2022 - 07:07:57 --- dev-tcltk/snack/Manifest | 3 +- .../files/snack-2.2.10-configure-clang16.patch | 12 ++ dev-tcltk/snack/snack-2.2.10-r10.ebuild | 124 +++++++++++++++++++++ dev-tcltk/snack/snack-2.2.10-r9.ebuild | 120 -------------------- 4 files changed, 138 insertions(+), 121 deletions(-) create mode 100644 dev-tcltk/snack/files/snack-2.2.10-configure-clang16.patch create mode 100644 dev-tcltk/snack/snack-2.2.10-r10.ebuild delete mode 100644 dev-tcltk/snack/snack-2.2.10-r9.ebuild (limited to 'dev-tcltk/snack') diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest index 7a179892936f..e3e525c266c2 100644 --- a/dev-tcltk/snack/Manifest +++ b/dev-tcltk/snack/Manifest @@ -1,5 +1,6 @@ AUX alsa-undef-sym.patch 1230 BLAKE2B 9551a46a1852a8503898d74927cd0b83c2508cb06db5292b557e99a1ad6873d749bf23e69d164ee54bdc68f4b4d60adf7f2bfd425d7bbc40f57e8e98d090131e SHA512 d730d6dbf721eeb46333f52824272cdecc48d975d5ef7eb21f7ba18ab2458dff72e33b3eb2dad489e65d651ddabfb478d4457d60affe172bc2433257863f37a0 AUX snack-2.2.10-CVE-2012-6303-fix.patch 778 BLAKE2B f6f34248825da751e81f4079d70fa7dec4dcbc5e63931aee58ad1f021e0a47f0bfdc7a52e69693bf32bae618a49f5c35c757694dd14984ebc79cd62acce2bda7 SHA512 6e2f7fcf8ca0c2792cf52432340f2319b8c82677a3568c9e382f91758f5e6bf26c3a05939d4a748c4198c4e50f27141ebd2cb298d8363765ed6582192d64d3e8 +AUX snack-2.2.10-configure-clang16.patch 419 BLAKE2B c35ed26f967184ba66ecf8f559e204dd82194c2d4b076780eb3c53748cf7438d50e8e5d2c583d444df5271123b72351fb0ee4095c7c886aef9df3756c22b9913 SHA512 adf57986c4b888d83bb532ccc8c7bc660340d67d3645e736d80c8480293834dea2b52e3cf7efb0f69e56808d17a5cf112fdaa42696762b0b7320cfe0c4249e6e AUX snack-2.2.10-darwin.patch 1108 BLAKE2B 862cd6a36363b45c9a27af08fa4bf347fc3e1a8fbbf972b72dfb4faf4cb135365fbe06377a20a2b77e02126e27de723b642067d8ccedb9947b9aa873069152ce SHA512 0d82270d830c8b7d15dcbead05d80c15666d1bac164f26c045859f7f4dc4c098961b48272ecd0b059a1b36ba8d560c563fe8e40add822f311026faf5f7eeaf0a AUX snack-2.2.10-debian-args.patch 4593 BLAKE2B bebc3c5cab2fea2b3fdc1c1c1e419855e49f2457d2014b2aa0f8236a637489e8b79fdac50d0b3369b576eea9a0bb130d46854c79939e6d93711c520e83001810 SHA512 686218bb22c3c8b53dcb18e10025f1a602c06fe11989a6e46dc02022d581fd281c03d2cca0938c2bad5947f8819e3c631f90f0439a8f274742bef80755dbd20e AUX snack-2.2.10-lto.patch 744 BLAKE2B 7aa6e82f47bdf21bd610226ab7ed3f3d552103cff9f3a1e3042f181e2424aa065dc49c06557596189ce9f99965e4447aaf2e7e330a4041684c1185fa09b71304 SHA512 140fdf1f78b0061f6b9dbb6a0e654b951b91e5074af677406817a9221946ed0b268b1e92c36024ff43645150791569f1a3999ccc389addd051211507f0bd074d @@ -7,5 +8,5 @@ AUX snack-2.2.10-test.patch 11984 BLAKE2B b3d3458aff3de62e3569f67af5c40c9f12311c AUX snack2.2.10-seektell-fix.patch 496 BLAKE2B a2e4e782788054c047596bd989241b9ecea3eeb2984c050888aced8289e77f30692386bcc437679bb5cc7a46f1616cbb3f4f64de017c343bcce2241b016d0cd5 SHA512 3e472dc7603426d35b23714435b3a8bfb6d54326eb1eaa54d8b79b4710035b3fed4e1f6a85ebad632950222c5cd55ac917dcb8cf2e87d0baa36124f8a3361fa8 AUX tcl-snack-2.2.10-python3.patch 12145 BLAKE2B eb33937789e0eab1316fdfcd472b5cf701a4072e498052cb2889e8c9e5a4502f193f386b83c96a2e98efcfca3dfeb389414e1b924b677ef68edfafe0e706048f SHA512 3480d83824e1d7e8250947d6f9d5a38704b302491980b7e8ad46a4d6790e3bdf9588b1d63048a9a5ed081c44b8f6c1dc42e79d3ad543f473b5469c711dc60394 DIST snack2.2.10.tar.gz 1798252 BLAKE2B e27b8e7d6082cdcfc06e7eea5ab832fb78ba104de9e56a69c6c9cd688183f7d4c6bdb974e4d5d2bf5ef2bc5518a913ddf17c90db8d10cef4dbee533307cc7718 SHA512 c17ad332fa4f3ded006b97ceca85cada079e4c7cd933768b289c13dadca1b8803fccaf709ec2def5af4abe92c307f25597ebfa6f94df2d681e40815cd7eccb9b -EBUILD snack-2.2.10-r9.ebuild 2488 BLAKE2B e1a7dc51ba044ffbeb26d7e97bc9aa8298fc2d6d079e5ae0c9fbad1b27e022f74d70b3b21a9a3ddd7f1e11770205d5f72416a21c2f279efe0463dbd76430dd28 SHA512 829558baae519990b3a414557b521c4da8dedf1929cd54f941382c2d3668834f2b5cf64c1cb53355b7aeac392a5db13a4e9f3ada789d578677c73c5ad502429f +EBUILD snack-2.2.10-r10.ebuild 2617 BLAKE2B 80fccaeee7162495ad0d6f13d7fc64d21186cdf45a9f103fa99b9d0d1ed6aedcbc315c23838fbf2936ce71855773cd37f2bc2ec88da7f78befef22f5da726a82 SHA512 0751c272c97dc763e55c760b2530f0d21cacd8b7c866dd2ca81d20c4f3b2fa4aad388db686eed26c20a481ef700090857b9681fdd6c5ce8713d57efb8745b564 MISC metadata.xml 260 BLAKE2B 9864f2503702b03d3ad715b3f2bd7ef7077f9ddef089de0d6a0840599d99a7f99d439ee50c12afc9ca99b0e288babf74b0bb2a6132ae6dd656b8d7c15e9b10a9 SHA512 3d1e4f14995736fb28198da21587a813a31f1330873ae3078dcd9a2452c1196d23e45983877d2e296353e1ac35cc6ff461b309585237bcc768e37e6b2728c23b diff --git a/dev-tcltk/snack/files/snack-2.2.10-configure-clang16.patch b/dev-tcltk/snack/files/snack-2.2.10-configure-clang16.patch new file mode 100644 index 000000000000..e038bf570abf --- /dev/null +++ b/dev-tcltk/snack/files/snack-2.2.10-configure-clang16.patch @@ -0,0 +1,12 @@ +Issue in autoconf which is already fixed upstream but we can't autoreconf, +it seems. +--- a/unix/configure ++++ b/unix/configure +@@ -2928,6 +2928,7 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include ++#include + #if ((' ' & 0x0FF) == 0x020) + # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) diff --git a/dev-tcltk/snack/snack-2.2.10-r10.ebuild b/dev-tcltk/snack/snack-2.2.10-r10.ebuild new file mode 100644 index 000000000000..4bed77e60cd6 --- /dev/null +++ b/dev-tcltk/snack/snack-2.2.10-r10.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9,10} ) +DISTUTILS_OPTIONAL=yes + +inherit distutils-r1 flag-o-matic toolchain-funcs virtualx + +DESCRIPTION="The Snack Sound Toolkit (Tcl)" +HOMEPAGE="http://www.speech.kth.se/snack/" +SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +SLOT="0" +IUSE="alsa examples python vorbis" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-lang/tcl:0= + dev-lang/tk:0= + alsa? ( media-libs/alsa-lib ) + python? ( ${PYTHON_DEPS} ) + vorbis? ( media-libs/libvorbis )" +RDEPEND="${DEPEND}" + +REQUIRED_USE=${PYTHON_REQUIRED_USE} + +S="${WORKDIR}/${PN}${PV}/unix" + +PATCHES=( + "${FILESDIR}"/alsa-undef-sym.patch + "${FILESDIR}"/${P}-CVE-2012-6303-fix.patch + "${FILESDIR}"/${P}-debian-args.patch + "${FILESDIR}"/${P}-test.patch + "${FILESDIR}"/${PN}${PV}-seektell-fix.patch + "${FILESDIR}"/tcl-${P}-python3.patch + "${FILESDIR}"/${P}-lto.patch + "${FILESDIR}"/${P}-configure-clang16.patch +) + +HTML_DOCS="${WORKDIR}/${PN}${PV}/doc/*" + +src_prepare() { + # adds -install_name (soname on Darwin) + [[ ${CHOST} == *-darwin* ]] && PATCHES+=( "${FILESDIR}"/${P}-darwin.patch ) + + sed \ + -e "s:ar cr:$(tc-getAR) cr:g" \ + -e "s|-O|${CFLAGS}|g" \ + -i Makefile.in || die + + cd .. + + default + + sed \ + -e 's|^\(#define roundf(.*\)|//\1|' \ + -i generic/jkFormatMP3.c || die + rm tests/{play,record}.test || die + if use python; then + cd python + distutils-r1_src_prepare + fi +} + +src_configure() { + # For Clang 16, bunch of -Wimplicit-int, etc + append-flags -std=gnu89 + + local myconf="" + + use alsa && myconf+=" --enable-alsa" + + if use vorbis; then + myconf+=" --with-ogg-include="${EPREFIX}"/usr/include" + myconf+=" --with-ogg-lib="${EPREFIX}"/usr/$(get_libdir)" + fi + + econf \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --includedir="${EPREFIX}"/usr/include \ + --with-tcl="${EPREFIX}"/usr/$(get_libdir) \ + --with-tk="${EPREFIX}"/usr/$(get_libdir) \ + $myconf + if use python; then + cd ../python + distutils-r1_src_configure + fi +} + +src_compile() { + default + if use python; then + cd ../python + distutils-r1_src_compile + fi +} + +src_test() { + TCLLIBPATH=${S} virtx default | tee snack.testResult + grep -q FAILED snack.testResult && die +} + +src_install() { + default + + if use python ; then + cd "${S}"/../python || die + distutils-r1_src_install + fi + + cd "${S}"/.. || die + + if use examples ; then + docinto examples + sed -i -e 's/wish[0-9.]+/wish/g' demos/tcl/* || die + dodoc -r demos/tcl + + use python && dodoc -r demos/python + fi +} diff --git a/dev-tcltk/snack/snack-2.2.10-r9.ebuild b/dev-tcltk/snack/snack-2.2.10-r9.ebuild deleted file mode 100644 index d95bd49e31da..000000000000 --- a/dev-tcltk/snack/snack-2.2.10-r9.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9,10} ) -DISTUTILS_OPTIONAL=yes - -inherit distutils-r1 toolchain-funcs virtualx - -DESCRIPTION="The Snack Sound Toolkit (Tcl)" -HOMEPAGE="http://www.speech.kth.se/snack/" -SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -SLOT="0" -IUSE="alsa examples python vorbis" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-lang/tcl:0= - dev-lang/tk:0= - alsa? ( media-libs/alsa-lib ) - python? ( ${PYTHON_DEPS} ) - vorbis? ( media-libs/libvorbis )" -RDEPEND="${DEPEND}" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -S="${WORKDIR}/${PN}${PV}/unix" - -PATCHES=( - "${FILESDIR}"/alsa-undef-sym.patch - "${FILESDIR}"/${P}-CVE-2012-6303-fix.patch - "${FILESDIR}"/${P}-debian-args.patch - "${FILESDIR}"/${P}-test.patch - "${FILESDIR}"/${PN}${PV}-seektell-fix.patch - "${FILESDIR}"/tcl-${P}-python3.patch - "${FILESDIR}"/${P}-lto.patch -) - -HTML_DOCS="${WORKDIR}/${PN}${PV}/doc/*" - -src_prepare() { - # adds -install_name (soname on Darwin) - [[ ${CHOST} == *-darwin* ]] && PATCHES+=( "${FILESDIR}"/${P}-darwin.patch ) - - sed \ - -e "s:ar cr:$(tc-getAR) cr:g" \ - -e "s|-O|${CFLAGS}|g" \ - -i Makefile.in || die - - cd .. - - default - - sed \ - -e 's|^\(#define roundf(.*\)|//\1|' \ - -i generic/jkFormatMP3.c || die - rm tests/{play,record}.test || die - if use python; then - cd python - distutils-r1_src_prepare - fi -} - -src_configure() { - local myconf="" - - use alsa && myconf+=" --enable-alsa" - - if use vorbis; then - myconf+=" --with-ogg-include="${EPREFIX}"/usr/include" - myconf+=" --with-ogg-lib="${EPREFIX}"/usr/$(get_libdir)" - fi - - econf \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --includedir="${EPREFIX}"/usr/include \ - --with-tcl="${EPREFIX}"/usr/$(get_libdir) \ - --with-tk="${EPREFIX}"/usr/$(get_libdir) \ - $myconf - if use python; then - cd ../python - distutils-r1_src_configure - fi -} - -src_compile() { - default - if use python; then - cd ../python - distutils-r1_src_compile - fi -} - -src_test() { - TCLLIBPATH=${S} virtx default | tee snack.testResult - grep -q FAILED snack.testResult && die -} - -src_install() { - default - - if use python ; then - cd "${S}"/../python || die - distutils-r1_src_install - fi - - cd "${S}"/.. || die - - if use examples ; then - docinto examples - sed -i -e 's/wish[0-9.]+/wish/g' demos/tcl/* || die - dodoc -r demos/tcl - - use python && dodoc -r demos/python - fi -} -- cgit v1.2.3