Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24739/main/finkinfo/x11
Modified Files:
Tag: pangocairo-branch
mlterm.info mlterm.patch
Log Message:
merge from HEAD
Index: mlterm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/mlterm.info,v
retrieving revision 1.4.2.11
retrieving revision 1.4.2.12
diff -u -d -r1.4.2.11 -r1.4.2.12
--- mlterm.info 30 Apr 2007 02:48:32 -0000 1.4.2.11
+++ mlterm.info 3 May 2007 23:17:10 -0000 1.4.2.12
@@ -81,5 +81,10 @@
is used in this step.
We define datarootdir in makefiles to prevent warnings by autoconf >= 2.6.
+
+ MacOS X >= 10.4 has posix_openpt() but needs ioctl(TIOCSTTY) instead of
+ open(slavetty) to acquire a controlling tty. The patch to
+ kik_pty_streams.c solves the problem. MacOS X <= 10.3 only has the
+ traditional BSD ptys and does not affected by the problem.
<<
Homepage: http://mlterm.sourceforge.net/
Index: mlterm.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/mlterm.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- mlterm.patch 30 Apr 2007 02:48:32 -0000 1.1.2.1
+++ mlterm.patch 3 May 2007 23:17:10 -0000 1.1.2.2
@@ -32,7 +32,7 @@
#
diff -Naur mlterm-2.9.3.orig/kiklib/src/kik_pty_streams.c
mlterm-2.9.3/kiklib/src/kik_pty_streams.c
--- mlterm-2.9.3.orig/kiklib/src/kik_pty_streams.c 2005-11-21
14:24:03.000000000 +0000
-+++ mlterm-2.9.3/kiklib/src/kik_pty_streams.c 2007-04-14 07:46:13.000000000
+0000
++++ mlterm-2.9.3/kiklib/src/kik_pty_streams.c 2007-04-29 03:09:10.000000000
+0000
@@ -2,6 +2,9 @@
* $Id$
*/
@@ -51,6 +51,27 @@
#include "kik_pty.h"
+@@ -244,6 +248,12 @@
+ }
+ #endif /*TIOCNOTTY*/
+ #endif /*HAVE_SETSID*/
++#ifdef TIOCSCTTY /* BSD (in addition Linux also knows TIOCSCTTY) */
++ if(ioctl(*slave, TIOCSCTTY, NULL) < 0)
++ {
++ return -1 ;
++ }
++#else /* no TIOCSCTTY (SysV) */
+ fd = open("/dev/tty", O_RDWR | O_NOCTTY);
+ if (fd >= 0)
+ {
+@@ -260,6 +270,7 @@
+ return -1;
+ }
+ close(fd);
++#endif /* no TIOCSCTTY (SysV) */
+
+ dup2( *slave , 0) ;
+ dup2( *slave , 1) ;
diff -Naur mlterm-2.9.3.orig/tool/mlconfig/po/Makefile.in.in
mlterm-2.9.3/tool/mlconfig/po/Makefile.in.in
--- mlterm-2.9.3.orig/tool/mlconfig/po/Makefile.in.in 2003-01-12
10:08:51.000000000 +0000
+++ mlterm-2.9.3/tool/mlconfig/po/Makefile.in.in 2005-04-02
17:29:55.000000000 +0000
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
