diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-04-26 19:47:53 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-04-26 19:47:53 +0000 |
| commit | 16f448356e4d7dbd917f7165d992853dbba262a7 (patch) | |
| tree | 875d40f41a8ba1e9ae9195e27354d939e798aa4f /dev-lang/tk | |
| parent | keyword ~amd64-fbsd (diff) | |
| download | gentoo-2-16f448356e4d7dbd917f7165d992853dbba262a7.tar.gz gentoo-2-16f448356e4d7dbd917f7165d992853dbba262a7.tar.bz2 gentoo-2-16f448356e4d7dbd917f7165d992853dbba262a7.zip | |
port tcl fbsd patch to let it build sanely on FreeBSD: the patch is for tcl.m4 and tk bundles it own unfixed version...
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/tk')
| -rw-r--r-- | dev-lang/tk/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/tk/files/tcl-8.5.9-gentoo-fbsd.patch | 13 | ||||
| -rw-r--r-- | dev-lang/tk/tk-8.5.11.ebuild | 6 |
3 files changed, 24 insertions, 2 deletions
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog index 87e0c02a0f1a..72e66a14834f 100644 --- a/dev-lang/tk/ChangeLog +++ b/dev-lang/tk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/tk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.168 2012/04/01 15:24:52 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.169 2012/04/26 19:47:53 aballier Exp $ + + 26 Apr 2012; Alexis Ballier <aballier@gentoo.org> + +files/tcl-8.5.9-gentoo-fbsd.patch, tk-8.5.11.ebuild: + port tcl fbsd patch to let it build sanely on FreeBSD: the patch is for + tcl.m4 and tk bundles it own unfixed version... 01 Apr 2012; Raúl Porcel <armin76@gentoo.org> tk-8.5.10-r1.ebuild: alpha/ia64/s390/sh/sparc stable wrt #406607 diff --git a/dev-lang/tk/files/tcl-8.5.9-gentoo-fbsd.patch b/dev-lang/tk/files/tcl-8.5.9-gentoo-fbsd.patch new file mode 100644 index 000000000000..022d81d3e261 --- /dev/null +++ b/dev-lang/tk/files/tcl-8.5.9-gentoo-fbsd.patch @@ -0,0 +1,13 @@ +diff --git a/unix/tcl.m4 b/unix/tcl.m4 +index fdd9d44..31bfca8 100644 +--- a/unix/tcl.m4 ++++ b/unix/tcl.m4 +@@ -1601,7 +1601,7 @@ dnl AC_CHECK_TOOL(AR, ar) + # Version numbers are dot-stripped by system policy. + TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots + ;; + Darwin-*) diff --git a/dev-lang/tk/tk-8.5.11.ebuild b/dev-lang/tk/tk-8.5.11.ebuild index b41086913984..ead688632896 100644 --- a/dev-lang/tk/tk-8.5.11.ebuild +++ b/dev-lang/tk/tk-8.5.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild,v 1.3 2012/03/19 08:10:12 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild,v 1.4 2012/04/26 19:47:53 aballier Exp $ EAPI=4 @@ -39,6 +39,10 @@ src_prepare() { # Bug 125971 epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch + # Bug 354067 : the same applies to tk, since the patch is about tcl.m4, just + # copy the tcl patch + epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch + sed -i 's/FT_New_Face/XftFontOpen/g' unix/configure.in || die cd "${S}"/unix |