diff options
Diffstat (limited to 'dev-lang/tk')
| -rw-r--r-- | dev-lang/tk/Manifest | 3 | ||||
| -rw-r--r-- | dev-lang/tk/files/tk-8.6.14-test.patch | 49 | ||||
| -rw-r--r-- | dev-lang/tk/tk-8.6.14.ebuild | 153 |
3 files changed, 205 insertions, 0 deletions
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest index b2a2da879f89..82767dc556cd 100644 --- a/dev-lang/tk/Manifest +++ b/dev-lang/tk/Manifest @@ -3,11 +3,14 @@ AUX tk-8.6.10-multilib.patch 404 BLAKE2B 64bead51acb308eb88147797288895cda5ea0f5 AUX tk-8.6.11-test.patch 2589 BLAKE2B 8917d71ef1072dfd10f35d009323f3787479104d53071fc094d762d66b260b7d72584b8bf330cc76a09fd45b471b19982edbb62603471d0c4f3ce056240b1ab1 SHA512 08648d57f3e27e574f94ff15821514fd53b85554f7e182a20685f3d6f6c5c2ef7557088c49e5689cbc88c5117e452ed512dd748b8524b5a7af60f084344ab897 AUX tk-8.6.12-test.patch 1394 BLAKE2B 08cb947cb2ce6cc86543c0e025656726ac0469964eadcd594f92035e1f58efe57c150455f5b74391048dc06c47186f7c5d5125fb505f17c5b8daac720d02c8b7 SHA512 1dfe6a615208cdc9ec51bc59ce0fb0076902f2469fd7ea12501b6fcf60deb818f072a5c053caf6ea2e06505054d8838fdfe2fafb8cf1bb3a040a859c259b6102 AUX tk-8.6.13-test.patch 1625 BLAKE2B 46f06da92c10da68736e809b24f52a01d71e832f2a284678416e17a6bef76fe891ee67e731115c8b6a3d0e35455ef8409f730b741ca5c1c60e11bba2929d1e63 SHA512 9110606e4e8786d5aaab3902ac33bfe611f2933de688cb7f62af3fa5d62c9ec1c05a8fc285f1161c868fc6f71999e00665d91f6ac41c9c6e1b5fdd63ddce1430 +AUX tk-8.6.14-test.patch 1608 BLAKE2B bf766dc5a39e5deb57c8dbdd15acf513123967c7cf61e2aa8352b7c6e1c11e60be809328e5f9da45d25a731f9c1672f7f29b528b274a6626f512661e86a7ef44 SHA512 e93e26050a2d594d056a4b1f18676d80faef2a1cd421312bddd12c0ded0cba732a9aa683ef9f6bd149580696007de36da934779986b44b4cdb14d8bc6ec0ac64 AUX tk-8.6.9-conf.patch 407 BLAKE2B 13662318b4c5029802f74551a6a194e27ddb6dbf2e5ceeecc45c98b27a5386a9b9443af7c329fc422c5249c3da6308552d5c879b5629ae47b705c0d2ddac5534 SHA512 10447a13d597c0917d15089dcfab64165927589ea0fbec7073699788f5ba003e561a6af6562b2ee3e3b40df2f9dc0719c2ca4209a927e506710a390c7a67eb70 DIST tk8.6.11.1-src.tar.gz 4496008 BLAKE2B d7bae2fa535411ad8620ec81cdc0b34a1206fed82f50dbd98d3977af46ac43f794166cb7029f274f7903228c62ce83dfbd56cea06669ff1e382b185d733b0792 SHA512 e2a1d27ba63601731d43c4c4e2b658771a14afd97ef8231f8bc7854e762b83a42f23b8db600e4b4a4a14ae6fc97378d0b9a9a180ae09308b9d12436ec2b176c4 DIST tk8.6.12-src.tar.gz 4515393 BLAKE2B 328522b7e1b4d291863db01ac93e18630f3984459d145a11d742f912a40d5634ffe4608760ce45f444903d45fb707bb48ecc3586913f0c2fde4664a402f6b862 SHA512 afe51eb3e2071640ebc57f9ee6979fe91ee7856df8d3c9d55ae70c470cdae2306d2feeb791f46258f529a5c4a07b53974a7574cf3594818cd4e99077b30c697b DIST tk8.6.13-src.tar.gz 4546848 BLAKE2B 5f00cf64feb7c7eb6739303c857dfabff4cbf4148c65462c2a5cc49cc8010fba950ffa7043101e98ded543a6c6e9b925dc1ee0e6e9031a240ae29b918f81060a SHA512 719aa6776bfdc814f817919a265d3f9d847782c9f0a5fc5c2ab139beeba921e6fde8c66e7e836d78f86f53c98a7df0e587f0b2f4b08cc5ce12eecbb7f1ab71a5 +DIST tk8.6.14-src.tar.gz 4510695 BLAKE2B 00b83a87b65317ca32228a11014bd9fe7cffb92089e152ca63a1e02ff23a5fc132b9336618f361692aa94ebf9e023cef492fafe39d51b9111feaec4934e8ae42 SHA512 756903dfa56cf77c7934bb3680c9bef6027f99196f4e6a2e823b85c342ca860cbb4b42154f576cc88f7f1265d28ce2d84ab5f52f848b16cca0cf9af4c770183f EBUILD tk-8.6.11.1.ebuild 4025 BLAKE2B 08f46d2172b16b334884c24d966d09e0ba6e74c1b35dd14787eae20941e5acbb7f7bb0432c08186f4df3ec9f409ab228734ff2d0ea94dfc5bfdb0ff430d30fac SHA512 9e3f47c56b5371caa64758faa8351db6d22f0303ab550fee9aaa0903b67aafccfbf0bf845eeef1925cbffe87e3a45e9804c8548ad27779dd35db29b28914e22e EBUILD tk-8.6.12.ebuild 4059 BLAKE2B 5eba5ee5623c7a15aa66589159ded6ee1cb67826eec3f45c966fc26917ac4e3f53d898d542c306abb8107bdb0c31dda0780dfa2325b644373c51e97130c85baf SHA512 e3e3e96daf5055e4d39d27a8b577e8bcd59aa064af1a8c5506b4c24c60b75afbf91e4361066ac596b88d259c681fd4d5b17f4316bf2c3339e1ce41184e104764 EBUILD tk-8.6.13.ebuild 4214 BLAKE2B 427c57a755a7d1a5d97ec7769ccf3143014288812c38b7a4818d12e3d1585116490a6e91b6843bd714b04e69e6c253c270c171fbe7f24ccd14741a49888b6460 SHA512 14e1db294c54fb519fc56cd6a72f27c34cc560e8286a1f7e26a434125f00729314538d785cce95f963a4227973af78b4d5050c3534f11eff04534fed9bed4356 +EBUILD tk-8.6.14.ebuild 4213 BLAKE2B 2f89894ee5173ad75364887a14f35e4400e9f323b1bd745efe78241d899de89e2bcf6bd2aacaebb204ec00f1d398a3b7d280f4f1cb30928ec680547c67710433 SHA512 372f4eb12b6625a480eaecddfc5ee2722ec2cac40aee70a61608d66b85ef3aa7571f166eabed3ab3d844c094401deb57daa1f59f1551c266dc84fa709ee8a597 MISC metadata.xml 375 BLAKE2B bb3f40f5b72544625f38a6b5b17d4435d3b0bb1aef8f668f3a1e1ea7f84bf7a25651b7894abbadd66f554f68eae113c74d348b5c821f686ea78e3c1f72709ead SHA512 3e175a0631c7add79e33cf4bd1254d5f1d82da26aa26ff072d5295bbca7a9d81c760145c2cbd853e854b06e08fcadcc55ea5ef2cbd016aec73c55b97507afef9 diff --git a/dev-lang/tk/files/tk-8.6.14-test.patch b/dev-lang/tk/files/tk-8.6.14-test.patch new file mode 100644 index 000000000000..a59f9d4e6861 --- /dev/null +++ b/dev-lang/tk/files/tk-8.6.14-test.patch @@ -0,0 +1,49 @@ +--- a/tests/textDisp.test 2024-03-10 14:25:29.581307116 +0100 ++++ b/tests/textDisp.test 2024-03-10 14:26:46.022318200 +0100 +@@ -2314,11 +2314,6 @@ + } + lequal [.t index @0,0] $expected + } {1} +-test textDisp-16.17 {TkTextYviewCmd procedure, "moveto" option} haveBigFontTwiceLargerThanTextFont { +-# constrained because text tagged with the big font plays a role +- .t yview moveto .755 +- .t index @0,0 +-} {151.80} + test textDisp-16.18 {TkTextYviewCmd procedure, "moveto" roundoff} { + catch {destroy .top1} + toplevel .top1 +--- a/tests/ttk/entry.test 2022-11-23 08:44:49.647148945 +0100 ++++ b/tests/ttk/entry.test 2022-11-23 08:51:48.524180822 +0100 +@@ -127,28 +127,28 @@ + set result [.e xview] + } -result {0.0 0.5} + +-test entry-3.3 "xview" -body { ++test entry-3.3 "xview" -constraints knownBug -body { + .e delete 0 end; + .e insert end abcdefghijklmnopqrstuvwxyz + .e xview end + set result [.e index @0] + } -result 7 + +-test entry-3.4 "xview" -body { ++test entry-3.4 "xview" -constraints knownBug -body { + .e delete 0 end; + .e insert end abcdefghijklmnopqrstuvwxyz + .e xview moveto 1.0 + set result [.e index @0] + } -result 7 + +-test entry-3.5 "xview" -body { ++test entry-3.5 "xview" -constraints knownBug -body { + .e delete 0 end; + .e insert end abcdefghijklmnopqrstuvwxyz + .e xview scroll 5 units + set result [.e index @0] + } -result 5 + +-test entry-3.6 "xview" -body { ++test entry-3.6 "xview" -constraints knownBug -body { + .e delete 0 end; + .e insert end [string repeat abcdefghijklmnopqrstuvwxyz 5] + .e xview scroll 2 pages diff --git a/dev-lang/tk/tk-8.6.14.ebuild b/dev-lang/tk/tk-8.6.14.ebuild new file mode 100644 index 000000000000..92f13ed68a65 --- /dev/null +++ b/dev-lang/tk/tk-8.6.14.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Please bump with dev-lang/tcl! + +inherit autotools multilib-minimal multilib prefix toolchain-funcs virtualx + +MY_P="${PN}${PV/_beta/b}" + +DESCRIPTION="Tk Widget Set" +HOMEPAGE="https://www.tcl.tk/" +SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" + +LICENSE="tcltk" +SLOT="0/8.6" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="debug +threads truetype aqua xscreensaver" +RESTRICT="!test? ( test )" + +RDEPEND=" + !aqua? ( + >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] + truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] ) + xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) + ) + ~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + !aqua? ( x11-base/xorg-proto )" +BDEPEND="virtual/pkgconfig" +# Not bumped to 8.6 +#RESTRICT=test + +SPARENT="${WORKDIR}/${PN}$(ver_cut 1-3 ${PV})" +S="${SPARENT}"/unix + +PATCHES=( + "${FILESDIR}"/${PN}-8.6.10-multilib.patch + "${FILESDIR}"/${PN}-8.4.15-aqua.patch + "${FILESDIR}"/${PN}-8.6.9-conf.patch # Bug 125971 + "${FILESDIR}"/${PN}-8.6.12-test.patch + "${FILESDIR}"/${P}-test.patch +) + +QA_CONFIG_IMPL_DECL_SKIP=( + stat64 opendir64 rewinddir64 closedir64 # used to test for Large File Support +) + +src_prepare() { + find \ + "${SPARENT}"/compat/* \ + -delete || die + + pushd "${SPARENT}" &>/dev/null || die + default + popd &>/dev/null || die + eprefixify Makefile.in + + # Make sure we use the right pkg-config, and link against fontconfig + # (since the code base uses Fc* functions). + sed \ + -e 's/FT_New_Face/XftFontOpen/g' \ + -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ + -e 's:xft freetype2:xft freetype2 fontconfig:' \ + -i configure.in || die + rm configure || die + + tc-export CC + + sed \ + -e '/chmod/s:555:755:g' \ + -i Makefile.in || die + + sed \ + -e 's:-O[2s]\?::g' \ + -i tcl.m4 || die + + mv configure.{in,ac} || die + + eautoconf + + multilib_copy_sources +} + +multilib_src_configure() { + if tc-is-cross-compiler ; then + export ac_cv_func_strtod=yes + export tcl_cv_strtod_buggy=1 + fi + + local mylibdir=$(get_libdir) + + econf \ + --with-tcl="${EPREFIX}/usr/${mylibdir}" \ + $(use_enable threads) \ + $(use_enable aqua) \ + $(use_enable truetype xft) \ + $(use_enable xscreensaver xss) \ + $(use_enable debug symbols) +} + +multilib_src_test() { + CI=1 virtx emake test +} + +multilib_src_install() { + #short version number + local v1=$(ver_cut 1-2) + local mylibdir=$(get_libdir) + + S= default + + # normalize $S path, bug #280766 (pkgcore) + local nS="$(cd "${S}"; pwd)" + + # fix the tkConfig.sh to eliminate refs to the build directory + # and drop unnecessary -L inclusion to default system libdir + + sed \ + -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \ + -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \ + -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \ + -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \ + -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \ + -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die + if use prefix && [[ ${CHOST} != *-darwin* ]] ; then + sed \ + -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ + -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ + -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die + fi + + # install private headers + insinto /usr/${mylibdir}/tk${v1}/include/unix + doins "${S}"/*.h + insinto /usr/${mylibdir}/tk${v1}/include/generic + doins "${SPARENT}"/generic/*.h + rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die + + # install symlink for libraries + dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) + dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a + + if multilib_is_native_abi; then + dosym wish${v1} /usr/bin/wish + dodoc "${SPARENT}"/{ChangeLog*,README.md,changes} + fi +} |