[skycat] 01/01: Fix pipe, fork, and kill with tcl/tk 8.6

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository skycat.

commit 511e231ccf045bc88e92a304f4d2be8eda66fd3d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Jul 20 19:54:45 2014 +0200

    Fix pipe, fork, and kill with tcl/tk 8.6
---
 debian/changelog                 |  6 +++++
 debian/control                   |  1 +
 debian/patches/remove_tclx.patch | 52 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 686d1ee..40df02d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+skycat (3.1.2+starlink1~b-8) UNRELEASED; urgency=medium
+
+  * Fix pipe, fork, and kill with tcl/tk 8.6
+
+ -- Ole Streicher <debian at liska.ath.cx>  Sun, 20 Jul 2014 19:53:07 +0200
+
 skycat (3.1.2+starlink1~b-7) unstable; urgency=medium
 
   * Switched to Tcl/Tk 8.6 and blt-2.5.3. Thanks to Sergei Golovan.
diff --git a/debian/control b/debian/control
index 5bb5cf5..e7cfce0 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Depends: blt (>= 2.5.3),
          itk3,
          libtk-img,
          tcl8.6,
+	 tcl-expect,
          tk8.6,
          ${misc:Depends},
          ${shlibs:Depends}
diff --git a/debian/patches/remove_tclx.patch b/debian/patches/remove_tclx.patch
index 474cbb7..5c10977 100644
--- a/debian/patches/remove_tclx.patch
+++ b/debian/patches/remove_tclx.patch
@@ -2,6 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Remove Tclx dependency
  The package seems to have only little dependencies of tclx. Since
  Tclx is not available for tcl8.6 and up, the depenency is removed.
+ To get the "fork" call, we additionally need the "expect" package.
 Note: For backporting to tcl8.5 and before, remove this patch and add
  Tclx to the dependencies.
 --- a/astrotcl/library/AstrotclInit.tcl
@@ -192,3 +193,54 @@ Note: For backporting to tcl8.5 and before, remove this patch and add
  	    if {$char == [string index $text $i]} {
  		return $i
  	    }
+--- a/tclutil/library/Batch.tcl
++++ b/tclutil/library/Batch.tcl
+@@ -40,6 +40,7 @@
+ #                        handlers. This was causing problems with
+ #                        Starlink infrastructure s/w (HDS).
+ #            02 Mar 99   Merged skycat 2.3.2 changes
++package require Expect
+ 
+ itk::usual Batch {}
+ 
+@@ -81,7 +82,7 @@
+ 	}
+ 	flush stdout
+ 	flush stderr
+-	pipe rfd wfd
++	lassign [chan pipe] rfd wfd
+ 	set pid [fork]
+ 	if {$pid == 0} {
+ 	    # child
+@@ -98,8 +99,8 @@
+ 	    puts $wfd $status
+ 	    flush $wfd
+ 	    close $wfd
+-	    kill SIGKILL [pid]
++	    kill [pid] 9
+ 	} else {
+ 	    set bg_pid_ $pid
+ 	    fileevent $rfd readable [code $this read_pipe $rfd $wfd]
+ 	}
+--- a/cat/library/AstroImage.tcl
++++ b/cat/library/AstroImage.tcl
+@@ -401,7 +401,7 @@
+ 	    return
+ 	}
+ 	if {"$onoff" == "on"} {
+-	    lassign [pipe] rfd_ wfd_
++	    lassign [chan pipe] rfd_ wfd_
+ 	    fileevent $rfd_ readable [code $this feedback]
+ 	    $w_.im feedback $wfd_
+ 	} elseif {[info exists rfd_]} {
+--- a/cat/library/AstroCat.tcl
++++ b/cat/library/AstroCat.tcl
+@@ -155,7 +155,7 @@
+ 	    return
+ 	}
+ 	if {"$onoff" == "on"} {
+-	    lassign [pipe] rfd_ wfd_
++	    lassign [chan pipe] rfd_ wfd_
+ 	    fileevent $rfd_ readable [code $this feedback]
+ 	    $w_.cat feedback $wfd_
+ 	} elseif {[info exists rfd_]} {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/skycat.git