[Pkg-tcltk-commits] r967 - in expect/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Fri Oct 30 15:18:23 UTC 2009
Author: sgolovan
Date: 2009-10-30 15:18:23 +0000 (Fri, 30 Oct 2009)
New Revision: 967
Removed:
expect/trunk/debian/patches/04-64bit.patch
expect/trunk/debian/patches/08-tcl-stubs.patch
expect/trunk/debian/patches/14-tcl8.5.patch
expect/trunk/debian/patches/17-tcl8.5.6.patch
Modified:
expect/trunk/debian/changelog
expect/trunk/debian/control
expect/trunk/debian/patches/13-implicit-defs.patch
expect/trunk/debian/patches/19-tk-init.patch
expect/trunk/debian/patches/series
expect/trunk/debian/rules
Log:
[expect]
* Removed build dependencies which are also dependencies of tk8.5-dev.
* Use locally defined function Tcl_ErrnoMsg in exp_clib.c because this
part of the library is supposed to be used without loading into a Tcl
interpreter, which isn't possible if expect is build with Tcl stubs
(closes: #552685).
* Removed unneeded patches from debian/patches, cleaned up other ones.
Modified: expect/trunk/debian/changelog
===================================================================
--- expect/trunk/debian/changelog 2009-10-30 08:41:12 UTC (rev 966)
+++ expect/trunk/debian/changelog 2009-10-30 15:18:23 UTC (rev 967)
@@ -1,6 +1,11 @@
expect (5.44.1.14-3) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ * Removed build dependencies which are also dependencies of tk8.5-dev.
+ * Use locally defined function Tcl_ErrnoMsg in exp_clib.c because this
+ part of the library is supposed to be used without loading into a Tcl
+ interpreter, which isn't possible if expect is build with Tcl stubs
+ (closes: #552685).
+ * Removed unneeded patches from debian/patches, cleaned up other ones.
-- Sergei Golovan <sgolovan at debian.org> Fri, 23 Oct 2009 12:33:16 +0400
Modified: expect/trunk/debian/control
===================================================================
--- expect/trunk/debian/control 2009-10-30 08:41:12 UTC (rev 966)
+++ expect/trunk/debian/control 2009-10-30 15:18:23 UTC (rev 967)
@@ -3,8 +3,7 @@
Priority: optional
Maintainer: Sergei Golovan <sgolovan at debian.org>
Build-Depends:
- debhelper (>= 7.0.50~), quilt (>=0.46-7), autotools-dev, autoconf, tcl8.5-dev, tk8.5-dev,
- x11proto-core-dev, libx11-dev, libxss-dev, libxext-dev, libxft-dev
+ debhelper (>= 7.0.50~), quilt (>=0.46-7), autotools-dev, autoconf, tcl8.5-dev, tk8.5-dev
Build-Conflicts: autoconf2.13
Standards-Version: 3.8.3
Homepage: http://sourceforge.net/projects/expect/
Deleted: expect/trunk/debian/patches/04-64bit.patch
===================================================================
--- expect/trunk/debian/patches/04-64bit.patch 2009-10-30 08:41:12 UTC (rev 966)
+++ expect/trunk/debian/patches/04-64bit.patch 2009-10-30 15:18:23 UTC (rev 967)
@@ -1,27 +0,0 @@
-Author: John R.Daily <jdaily at progeny.com>
-Description: Fixes problems on 64bit platforms (Closes: #126091).
-
-diff -Naurp expect.orig/exp_main_tk.c expect/exp_main_tk.c
---- expect.orig/exp_main_tk.c 2009-08-03 06:58:30.000000000 +0000
-+++ expect/exp_main_tk.c 2009-08-03 08:34:14.000000000 +0000
-@@ -33,6 +33,7 @@ static char sccsid[] = "@(#) tkAppInit.c
- #endif /* not lint */
-
- #include <ctype.h>
-+#include <string.h> /* strrchr(3) */
-
- #include "tk.h"
-
-diff -Naurp expect.orig/pty_termios.c expect/pty_termios.c
---- expect.orig/pty_termios.c 2009-08-03 06:58:30.000000000 +0000
-+++ expect/pty_termios.c 2009-08-03 08:34:14.000000000 +0000
-@@ -14,7 +14,9 @@ would appreciate credit if you use this
- #define SIGCHLD SIGCLD
- #endif
-
-+#include "expect.h"
- #include "expect_cf.h"
-+#include "exp_int.h" /* expErrnoMsg() prototype */
-
- /*
- The following functions are linked from the Tcl library. They
Deleted: expect/trunk/debian/patches/08-tcl-stubs.patch
===================================================================
--- expect/trunk/debian/patches/08-tcl-stubs.patch 2009-10-30 08:41:12 UTC (rev 966)
+++ expect/trunk/debian/patches/08-tcl-stubs.patch 2009-10-30 15:18:23 UTC (rev 967)
@@ -1,146 +0,0 @@
-Author: David Engel <david at debian.org>
-Description: Uses tcl stubs if available.
-
-diff -Naurp expect.orig/configure.in expect/configure.in
---- expect.orig/configure.in 2009-08-03 06:58:30.000000000 +0000
-+++ expect/configure.in 2009-08-03 08:37:10.000000000 +0000
-@@ -319,6 +319,18 @@ else
- AC_MSG_RESULT(unshared)
- fi
-
-+# now see if we can/should use Tcl stubs
-+AC_MSG_CHECKING([whether to use Tcl stubs])
-+AC_ARG_ENABLE(stubs,
-+ [ --enable-stubs use Tcl stubs, if available],
-+ [enable_stubs=$enableval], [enable_stubs=no])
-+if test "$enable_shared" = "yes" && test "$enable_stubs" = "yes" && test "x${TCL_SUPPORTS_STUBS}" = "x1"; then
-+ AC_MSG_RESULT(yes)
-+ EXP_CFLAGS="$EXP_CFLAGS -DUSE_TCL_STUBS"
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+
- #
- # Now that we've found the Tcl sources, configure the debugger
- # this is a little tricky because it has its own configure script
-@@ -1174,7 +1186,11 @@ if test "x$TCL_SHLIB_LD_LIBS" = "x" ; th
- else
- # seems a little strange to build in Tcl's build-lib, but
- # that's what Tk does.
-- EXP_SHLIB_LD_LIBS="$TCL_BUILD_LIB_SPEC $TCL_DL_LIBS $LIBS -lc"
-+ if test "$enable_stubs" = "yes"; then
-+ EXP_SHLIB_LD_LIBS="$TCL_BUILD_STUB_LIB_SPEC $TCL_DL_LIBS $LIBS $LIBS -lc"
-+ else
-+ EXP_SHLIB_LD_LIBS="$TCL_BUILD_LIB_SPEC $TCL_DL_LIBS $LIBS -lc"
-+ fi
- fi
-
- #--------------------------------------------------------------------
-diff -Naurp expect.orig/exp_command.c expect/exp_command.c
---- expect.orig/exp_command.c 2009-08-03 06:58:30.000000000 +0000
-+++ expect/exp_command.c 2009-08-03 08:37:10.000000000 +0000
-@@ -123,6 +123,10 @@ int exp_configure_count = 0;
- static Tcl_HashTable slaveNames;
- #endif /* HAVE_PTYTRAP */
-
-+/* These save the original functions so they can be used later. */
-+Tcl_CmdInfo exp_close_info;
-+Tcl_CmdInfo exp_return_info;
-+
- typedef struct ThreadSpecificData {
- /*
- * List of all exp channels currently open. This is per thread and is
-@@ -2311,12 +2315,9 @@ Tcl_Obj *CONST objv[]; /* Argument objec
- /* Historical note: we used "close" long before there was a */
- /* Tcl builtin by the same name. */
-
-- Tcl_CmdInfo info;
- Tcl_ResetResult(interp);
-- if (0 == Tcl_GetCommandInfo(interp,"close",&info)) {
-- info.clientData = 0;
-- }
-- return(Tcl_CloseObjCmd(info.clientData,interp,objc_orig,objv_orig));
-+
-+ return(exp_close_info.objProc(exp_close_info.objClientData,interp,objc_orig,objv_orig));
- }
-
- if (chanName) {
-@@ -2961,7 +2962,7 @@ Tcl_Obj *CONST objv[];
- /* if successful (i.e., TCL_RETURN is returned) */
- /* modify the result, so that we will handle it specially */
-
-- int result = Tcl_ReturnObjCmd(clientData,interp,objc,objv);
-+ int result = exp_return_info.objProc(exp_return_info.objClientData,interp,objc,objv);
- if (result == TCL_RETURN)
- result = EXP_TCL_RETURN;
- return result;
-diff -Naurp expect.orig/exp_command.h expect/exp_command.h
---- expect.orig/exp_command.h 2009-08-03 06:58:30.000000000 +0000
-+++ expect/exp_command.h 2009-08-03 08:37:10.000000000 +0000
-@@ -34,6 +34,9 @@ EXTERN int exp_default_parity;
- EXTERN int exp_default_rm_nulls;
- EXTERN int exp_default_close_on_eof;
-
-+EXTERN Tcl_CmdInfo exp_close_info;
-+EXTERN Tcl_CmdInfo exp_return_info;
-+
- EXTERN int exp_one_arg_braced _ANSI_ARGS_((Tcl_Obj *));
- EXTERN int exp_eval_with_one_arg _ANSI_ARGS_((ClientData,
- Tcl_Interp *, struct Tcl_Obj * CONST objv[]));
-diff -Naurp expect.orig/exp_main_exp.c expect/exp_main_exp.c
---- expect.orig/exp_main_exp.c 2009-08-03 06:58:30.000000000 +0000
-+++ expect/exp_main_exp.c 2009-08-03 08:37:10.000000000 +0000
-@@ -7,6 +7,9 @@ dollars. Therefore it is public domain.
- would appreciate credit if this program or parts of it are used.
- */
-
-+/* Don't use stubs since we are in the main application. */
-+#undef USE_TCL_STUBS
-+
- #include "expect_cf.h"
- #include <stdio.h>
- #include "tcl.h"
-diff -Naurp expect.orig/exp_main_sub.c expect/exp_main_sub.c
---- expect.orig/exp_main_sub.c 2009-08-03 06:58:30.000000000 +0000
-+++ expect/exp_main_sub.c 2009-08-03 08:37:10.000000000 +0000
-@@ -486,6 +486,7 @@ Tcl_Interp *interp;
- char *dot = strchr(TCL_VERSION,'.');
- int tcl_minor = atoi(dot+1);
-
-+#ifndef USE_TCL_STUBS
- if (tcl_major < NEED_TCL_MAJOR ||
- (tcl_major == NEED_TCL_MAJOR && tcl_minor < NEED_TCL_MINOR)) {
- sprintf(interp->result,
-@@ -499,6 +500,19 @@ Tcl_Interp *interp;
- if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 0) == NULL) {
- return TCL_ERROR;
- }
-+#else
-+ if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
-+ return TCL_ERROR;
-+ }
-+#endif
-+
-+ if (Tcl_GetCommandInfo(interp, "close", &exp_close_info) == 0) {
-+ return TCL_ERROR;
-+ }
-+ if (Tcl_GetCommandInfo(interp, "return", &exp_return_info) == 0) {
-+ return TCL_ERROR;
-+ }
-+
- if (Tcl_PkgProvide(interp, "Expect", EXP_VERSION) != TCL_OK) {
- return TCL_ERROR;
- }
-diff -Naurp expect.orig/exp_main_tk.c expect/exp_main_tk.c
---- expect.orig/exp_main_tk.c 2009-08-03 06:58:30.000000000 +0000
-+++ expect/exp_main_tk.c 2009-08-03 08:37:10.000000000 +0000
-@@ -32,6 +32,9 @@
- static char sccsid[] = "@(#) tkAppInit.c 1.19 95/12/23 17:09:24";
- #endif /* not lint */
-
-+/* Don't use stubs since we are in the main application. */
-+#undef USE_TCL_STUBS
-+
- #include <ctype.h>
-
- #include "tk.h"
Modified: expect/trunk/debian/patches/13-implicit-defs.patch
===================================================================
--- expect/trunk/debian/patches/13-implicit-defs.patch 2009-10-30 08:41:12 UTC (rev 966)
+++ expect/trunk/debian/patches/13-implicit-defs.patch 2009-10-30 15:18:23 UTC (rev 967)
@@ -43,28 +43,24 @@
#include <stdlib.h> /* for malloc */
#endif
-+#include "tcl.h"
++#include <tcl.h>
#include "expect.h"
+#include "exp_command.h"
#define TclRegError exp_TclRegError
/*
-@@ -1465,6 +1469,7 @@ TclGetRegError()
- * end of regexp definitions and code
+@@ -1492,7 +1492,10 @@
+ *----------------------------------------------------------------------
*/
-+#if 0
- /*
- * following stolen from tcl8.0.4/generic/tclPosixStr.c
- */
-@@ -1921,6 +1926,7 @@ Tcl_ErrnoMsg(err)
- #endif
- }
- }
+-static
++#ifdef Tcl_ErrnoMsg
++#undef Tcl_ErrnoMsg
+#endif
-
- /*
- * end of excerpt from tcl8.0.X/generic/tclPosixStr.c
++
+ char *
+ Tcl_ErrnoMsg(err)
+ int err; /* Error number (such as in errno variable). */
diff -Naurp expect.orig/exp_command.h expect/exp_command.h
--- expect.orig/exp_command.h 2009-08-03 08:39:25.000000000 +0000
+++ expect/exp_command.h 2009-08-03 08:39:40.000000000 +0000
@@ -78,15 +74,6 @@
#ifdef HAVE_SYS_WAIT_H
/* ISC doesn't def WNOHANG unless _POSIX_SOURCE is def'ed */
# ifdef WNOHANG_REQUIRES_POSIX_SOURCE
-@@ -23,7 +26,7 @@ would appreciate credit if this program
- # undef panic
- #endif
-
--#include <tclPort.h>
-+#include "tclPort.h"
-
- #define EXP_CHANNELNAMELEN (16 + TCL_INTEGER_SPACE)
-
@@ -100,11 +103,11 @@ typedef struct ExpState {
char name[EXP_CHANNELNAMELEN+1]; /* expect and interact set variables
to channel name, so for efficiency
@@ -160,11 +147,12 @@
#include <ctype.h>
+#include <string.h> /* strrchr(3) */
-+#include "tclInt.h" /* Internal definitions for Tcl. */
-+#include "tcl.h"
++#include <tclInt.h> /* Internal definitions for Tcl. */
++#include <tcl.h>
+
- #include "tk.h"
-+#include "tkInt.h"
+-#include "tk.h"
++#include <tk.h>
++#include <tkInt.h>
#include "expect_tcl.h"
#include "tcldbg.h"
@@ -188,7 +176,15 @@
diff -Naurp expect.orig/exp_trap.c expect/exp_trap.c
--- expect.orig/exp_trap.c 2009-08-03 08:39:25.000000000 +0000
+++ expect/exp_trap.c 2009-08-03 08:39:40.000000000 +0000
-@@ -28,6 +28,7 @@ would appreciate credit if this program
+@@ -11,6 +11,7 @@ would appreciate credit if this program
+ #include "expect_cf.h"
+
+ #include <stdio.h>
++#include <string.h>
+ #include <signal.h>
+ #include <sys/types.h>
+
+@@ -28,6 +29,7 @@ would appreciate credit if this program
#include "exp_prog.h"
#include "exp_command.h"
#include "exp_log.h"
@@ -215,7 +211,7 @@
#include "expect_cf.h"
+#include "expect.h"
-+#include "tcl.h"
++#include <tcl.h>
#ifdef __MACHTEN__
#include "sys/types.h"
@@ -292,7 +288,7 @@
#endif
#include "expect_cf.h"
-+#include "tcl.h"
++#include <tcl.h>
+#include "expect.h"
+#include "exp_tty_in.h"
+#include "exp_int.h" /* expErrnoMsg() prototype */
Deleted: expect/trunk/debian/patches/14-tcl8.5.patch
===================================================================
--- expect/trunk/debian/patches/14-tcl8.5.patch 2009-10-30 08:41:12 UTC (rev 966)
+++ expect/trunk/debian/patches/14-tcl8.5.patch 2009-10-30 15:18:23 UTC (rev 967)
@@ -1,25 +0,0 @@
-Author: Adam Tkac <atkac at redhat.com>
-Description: Fixes for tcl8.5.
-
-diff -Naurp expect.orig/Dbg.c expect/Dbg.c
---- expect.orig/Dbg.c 2009-08-03 06:58:30.000000000 +0000
-+++ expect/Dbg.c 2009-08-03 08:41:01.000000000 +0000
-@@ -10,6 +10,7 @@ would appreciate credit if this program
-
- #include <stdio.h>
-
-+#include "expect_cf.h"
- #include "tcldbgcf.h"
- #if 0
- /* tclInt.h drags in stdlib. By claiming no-stdlib, force it to drag in */
-diff -Naurp expect.orig/exp_inter.c expect/exp_inter.c
---- expect.orig/exp_inter.c 2009-08-03 06:58:30.000000000 +0000
-+++ expect/exp_inter.c 2009-08-03 08:41:01.000000000 +0000
-@@ -36,6 +36,7 @@ would appreciate credit if this program
- #include <ctype.h>
-
- #include "tcl.h"
-+#include "tclInt.h"
- #include "string.h"
-
- #include "exp_tty_in.h"
Deleted: expect/trunk/debian/patches/17-tcl8.5.6.patch
===================================================================
--- expect/trunk/debian/patches/17-tcl8.5.6.patch 2009-10-30 08:41:12 UTC (rev 966)
+++ expect/trunk/debian/patches/17-tcl8.5.6.patch 2009-10-30 15:18:23 UTC (rev 967)
@@ -1,45 +0,0 @@
-Author: Vitezslav Crhonek <vcrhonek at redhat.com>
-Description: Fixes for new Tcl.
-
-diff -Naurp expect.orig/exp_command.c expect/exp_command.c
---- expect.orig/exp_command.c 2009-08-03 09:23:29.000000000 +0000
-+++ expect/exp_command.c 2009-08-03 09:24:31.000000000 +0000
-@@ -2321,12 +2321,11 @@ Tcl_Obj *CONST objv[]; /* Argument objec
- /* Historical note: we used "close" long before there was a */
- /* Tcl builtin by the same name. */
-
-- Tcl_CmdInfo info;
-+ Tcl_CmdInfo* close_info;
- Tcl_ResetResult(interp);
-- if (0 == Tcl_GetCommandInfo(interp,"close",&info)) {
-- info.clientData = 0;
-- }
-- return(Tcl_CloseObjCmd(info.clientData,interp,objc_orig,objv_orig));
-+
-+ close_info = (Tcl_CmdInfo*) Tcl_GetAssocData (interp, EXP_CMDINFO_CLOSE, NULL);
-+ return(close_info->objProc(close_info->objClientData,interp,objc,objv));
- }
-
- if (chanName) {
-@@ -2971,7 +2970,10 @@ Tcl_Obj *CONST objv[];
- /* if successful (i.e., TCL_RETURN is returned) */
- /* modify the result, so that we will handle it specially */
-
-- int result = Tcl_ReturnObjCmd(clientData,interp,objc,objv);
-+ Tcl_CmdInfo* return_info = (Tcl_CmdInfo*)
-+ Tcl_GetAssocData (interp, EXP_CMDINFO_RETURN, NULL);
-+
-+ int result = return_info->objProc(return_info->objClientData,interp,objc,objv);
- if (result == TCL_RETURN)
- result = EXP_TCL_RETURN;
- return result;
-diff -Naurp expect.orig/exp_command.h expect/exp_command.h
---- expect.orig/exp_command.h 2009-08-03 09:23:29.000000000 +0000
-+++ expect/exp_command.h 2009-08-03 09:25:30.000000000 +0000
-@@ -334,3 +334,6 @@ EXTERN int Exp_StringCaseMatch _ANSI_AR
- EXTERN int expSizeGet _ANSI_ARGS_((ExpState *));
- EXTERN int expSizeZero _ANSI_ARGS_((ExpState *));
- #endif /* __EXP_COMMAND_H */
-+
-+#define EXP_CMDINFO_CLOSE "expect/cmdinfo/close"
-+#define EXP_CMDINFO_RETURN "expect/cmdinfo/return"
Modified: expect/trunk/debian/patches/19-tk-init.patch
===================================================================
--- expect/trunk/debian/patches/19-tk-init.patch 2009-10-30 08:41:12 UTC (rev 966)
+++ expect/trunk/debian/patches/19-tk-init.patch 2009-10-30 15:18:23 UTC (rev 967)
@@ -4,7 +4,27 @@
--- expect-5.44.1.14.orig/exp_main_tk.c
+++ expect-5.44.1.14/exp_main_tk.c
-@@ -162,13 +173,7 @@
+@@ -29,7 +29,7 @@
+ */
+
+ #ifndef lint
+-static char sccsid[] = "@(#) tkAppInit.c 1.19 95/12/23 17:09:24";
++/* static char sccsid[] = "@(#) tkAppInit.c 1.19 95/12/23 17:09:24"; */
+ #endif /* not lint */
+
+ /* Don't use stubs since we are in the main application. */
+@@ -162,24 +173,11 @@
+
+
+-
+-/*
+- * Count of number of main windows currently open in this process.
+- */
+-
+-static int numMainWindows;
+-
+ /*
+ * The variables and table below are used to parse arguments from
* the "argv" variable in Tk_Init.
*/
Modified: expect/trunk/debian/patches/series
===================================================================
--- expect/trunk/debian/patches/series 2009-10-30 08:41:12 UTC (rev 966)
+++ expect/trunk/debian/patches/series 2009-10-30 15:18:23 UTC (rev 967)
@@ -1,11 +1,9 @@
01-example-shebang.patch
02-example-cryptdir.patch
#03-spawn.patch
-#04-64bit.patch
05-makefile-soname.patch
06-pkgindex.patch
07-file-handle.patch
-#08-tcl-stubs.patch
09-unsafe-traps.patch
10-manpage.patch
11-ttyname.patch
Modified: expect/trunk/debian/rules
===================================================================
--- expect/trunk/debian/rules 2009-10-30 08:41:12 UTC (rev 966)
+++ expect/trunk/debian/rules 2009-10-30 15:18:23 UTC (rev 967)
@@ -8,7 +8,7 @@
%:
dh ${@} --with quilt
-CFLAGS = -Wall -g -D_BSD_SOURCE
+CFLAGS = -Wall -g -D_BSD_SOURCE -ansi -D_SVID_SOURCE -D_POSIX_SOURCE
override_dh_auto_clean:
dh_auto_clean
@@ -39,7 +39,7 @@
--with-tkinclude=/usr/include/tcl8.5/tk-private/generic \
--enable-shared \
--enable-threads \
- CFLAGS="$(CFLAGS) -D_BSD_SOURCE -ansi -D_SVID_SOURCE -D_POSIX_SOURCE -D_REENTRANT"
+ CFLAGS="$(CFLAGS)"
override_dh_auto_build:
$(MAKE) SONAME=libexpect.so.$(VERSION)
More information about the Pkg-tcltk-commits
mailing list