public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/modules/files/, sys-cluster/modules/
Date: Wed, 26 Jun 2013 14:53:18 +0000 (UTC)	[thread overview]
Message-ID: <1372229659.84f2e60f8093d6fe3fe38552d29f44b69732df34.jlec@gentoo> (raw)

commit:     84f2e60f8093d6fe3fe38552d29f44b69732df34
Author:     Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Wed Jun 26 06:54:19 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 06:54:19 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=84f2e60f

added TCL patch to modules 3.2.10 ebuild

---
 sys-cluster/modules/files/modules-3.2.10-errorline.patch | 15 +++++++++++++++
 sys-cluster/modules/modules-3.2.10.ebuild                |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/sys-cluster/modules/files/modules-3.2.10-errorline.patch b/sys-cluster/modules/files/modules-3.2.10-errorline.patch
new file mode 100644
index 0000000..a319ac8
--- /dev/null
+++ b/sys-cluster/modules/files/modules-3.2.10-errorline.patch
@@ -0,0 +1,15 @@
+diff -ru modules-3.2.9-old/cmdModule.c modules-3.2.9/cmdModule.c
+--- modules-3.2.9-old/cmdModule.c	2013-06-02 22:46:09.196302980 +0200
++++ modules-3.2.9/cmdModule.c	2013-06-02 22:53:36.706298800 +0200
+@@ -640,8 +640,8 @@
+             case TCL_OK:	gotPartial = 0;
+ 			        continue;	/** while **/
+ 	    
+-            case TCL_ERROR:	interp->errorLine = ((linenum-1)-gotPartial) +
+-				    interp->errorLine;
++		case TCL_ERROR:	Tcl_SetErrorLine(interp, ((linenum-1)-gotPartial) +
++										 Tcl_GetErrorLine(interp));
+ 	    			/* FALLTHROUGH */
+ 
+             case TCL_LEVEL0_RETURN:
+Nur in modules-3.2.9: cmdModule.c~.

diff --git a/sys-cluster/modules/modules-3.2.10.ebuild b/sys-cluster/modules/modules-3.2.10.ebuild
index 8c54903..8ec69c8 100644
--- a/sys-cluster/modules/modules-3.2.10.ebuild
+++ b/sys-cluster/modules/modules-3.2.10.ebuild
@@ -26,9 +26,9 @@ S="${WORKDIR}/${P%[a-z]}"
 
 DOCS=(ChangeLog README NEWS TODO)
 
-#src_prepare() {
-#	epatch "${FILESDIR}/${P}-errorline.patch"
-#}
+src_prepare() {
+	has_version ">=dev-lang/tcl-8.6.0" && epatch "${FILESDIR}/${P}-errorline.patch"
+}
 
 src_configure() {
 	local myeconfargs=(


             reply	other threads:[~2013-06-26 14:53 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-26 14:53 Justin Lecher [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-09-26 19:11 [gentoo-commits] proj/sci:master commit in: sys-cluster/modules/files/, sys-cluster/modules/ Aisha Tammy
2017-08-25 19:36 Andrew Savchenko
2014-01-26 22:52 Nicolas Bock
2013-06-26 17:23 Sebastien Fabbro
2013-06-03 23:33 Christoph Junghans
2013-06-03 23:33 Christoph Junghans

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1372229659.84f2e60f8093d6fe3fe38552d29f44b69732df34.jlec@gentoo \
    --to=jlec@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox