diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-06-15 16:12:28 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-06-15 16:12:28 +0000 |
| commit | b259834b10010dd4d9664944b8f37afafe2df9a0 (patch) | |
| tree | 8d5283014f04326c059b04d439df9aa66ca1c2d8 /dev-tcltk | |
| parent | Remove threads useflag as switching it on or off breaks the ABI, bugs #473282... (diff) | |
| download | gentoo-2-b259834b10010dd4d9664944b8f37afafe2df9a0.tar.gz gentoo-2-b259834b10010dd4d9664944b8f37afafe2df9a0.tar.bz2 gentoo-2-b259834b10010dd4d9664944b8f37afafe2df9a0.zip | |
dev-tcltk/tdom: Conditionally use Tcl_GetErrorLine, #473314
(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 8009D6F070EB7916)
Diffstat (limited to 'dev-tcltk')
| -rw-r--r-- | dev-tcltk/tdom/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch | 15 | ||||
| -rw-r--r-- | dev-tcltk/tdom/tdom-0.8.3-r4.ebuild (renamed from dev-tcltk/tdom/tdom-0.8.3-r3.ebuild) | 2 |
3 files changed, 18 insertions, 7 deletions
diff --git a/dev-tcltk/tdom/ChangeLog b/dev-tcltk/tdom/ChangeLog index 7af673add212..5d5d0d90529d 100644 --- a/dev-tcltk/tdom/ChangeLog +++ b/dev-tcltk/tdom/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-tcltk/tdom # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.21 2013/05/21 06:09:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.22 2013/06/15 16:12:27 jlec Exp $ + +*tdom-0.8.3-r4 (15 Jun 2013) + + 15 Jun 2013; Justin Lecher <jlec@gentoo.org> -tdom-0.8.3-r3.ebuild, + +tdom-0.8.3-r4.ebuild, files/tdom-0.8.3-tcl8.6.patch: + Conditionally use Tcl_GetErrorLine, #473314 21 May 2013; Justin Lecher <jlec@gentoo.org> -tdom-0.8.3-r1.ebuild, -tdom-0.8.3-r2.ebuild: diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch b/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch index b61ec8c5d449..5a805931ca31 100644 --- a/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch +++ b/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch @@ -1,16 +1,21 @@ - generic/tcldom.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + generic/tcldom.c | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/generic/tcldom.c b/generic/tcldom.c -index 91d98c9..ae6d413 100644 +index 91d98c9..0f024b3 100644 --- a/generic/tcldom.c +++ b/generic/tcldom.c -@@ -5934,7 +5934,7 @@ int tcldom_EvalLocked ( +@@ -5933,8 +5933,13 @@ int tcldom_EvalLocked ( + ret = Tcl_EvalObj(interp, objv[2]); if (ret == TCL_ERROR) { char msg[64 + TCL_INTEGER_SPACE]; ++ #if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6 sprintf(msg, "\n (\"%s %s\" body line %d)", Tcl_GetString(objv[0]), -- Tcl_GetString(objv[1]), interp->errorLine); + Tcl_GetString(objv[1]), interp->errorLine); ++ #else ++ sprintf(msg, "\n (\"%s %s\" body line %d)", Tcl_GetString(objv[0]), + Tcl_GetString(objv[1]), Tcl_GetErrorLine(interp)); ++ #endif Tcl_AddErrorInfo(interp, msg); } diff --git a/dev-tcltk/tdom/tdom-0.8.3-r3.ebuild b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild index f5516ceb98f6..6b5fff381c4a 100644 --- a/dev-tcltk/tdom/tdom-0.8.3-r3.ebuild +++ b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/tdom-0.8.3-r3.ebuild,v 1.3 2013/05/20 08:22:10 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild,v 1.1 2013/06/15 16:12:27 jlec Exp $ EAPI=5 |