commit: f9ba7161ed0c960f3add84d0edd267e71d9ce379 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Tue Dec 5 17:35:36 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Wed Dec 6 11:59:47 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ba7161
dev-tcltk/expect: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/6456 .../expect/files/expect-5.44.1.15-expectk.patch | 14 --- .../expect/files/expect-5.44.1.15-gfbsd.patch | 17 --- .../expect/files/expect-5.44.1.15-headers.patch | 86 --------------- .../expect/files/expect-5.44.1.15_with-tk-no.patch | 117 --------------------- 4 files changed, 234 deletions(-) diff --git a/dev-tcltk/expect/files/expect-5.44.1.15-expectk.patch b/dev-tcltk/expect/files/expect-5.44.1.15-expectk.patch deleted file mode 100644 index 0c0ba80293e..00000000000 --- a/dev-tcltk/expect/files/expect-5.44.1.15-expectk.patch +++ /dev/null @@ -1,14 +0,0 @@ -expectk is only built when TK_BIN_DIR is defined. the configure script -takes care of figuring out this value, but then they forgot to actually -write it out to the Makefile. - ---- Makefile.in -+++ Makefile.in -@@ -24,6 +24,7 @@ - # SETUID = chmod u+s - - LIB_RUNTIME_DIR = $(DESTDIR)@libdir@ -+TK_BIN_DIR = @TK_BIN_DIR@ - - # The following Expect scripts are not necessary to have installed as - # commands, but are very useful. Edit out what you don't want diff --git a/dev-tcltk/expect/files/expect-5.44.1.15-gfbsd.patch b/dev-tcltk/expect/files/expect-5.44.1.15-gfbsd.patch deleted file mode 100644 index d67de2126a0..00000000000 --- a/dev-tcltk/expect/files/expect-5.44.1.15-gfbsd.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- expect-5.44.1.15/tclconfig/tcl.m4.orig 2010-04-08 22:49:51.568043292 -0700 -+++ expect-5.44.1.15/tclconfig/tcl.m4 2010-04-08 22:50:28.207915301 -0700 -@@ -1579,12 +1579,12 @@ - FreeBSD-*) - # FreeBSD 3.* and greater have ELF. - SHLIB_CFLAGS="-fPIC" -- SHLIB_LD="ld -Bshareable -x" -+ SHLIB_LD="${CC} -shared" - SHLIB_LD_LIBS='${LIBS}' - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" -- LDFLAGS="$LDFLAGS -export-dynamic" -+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic" - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' - if test "${TCL_THREADS}" = "1" ; then diff --git a/dev-tcltk/expect/files/expect-5.44.1.15-headers.patch b/dev-tcltk/expect/files/expect-5.44.1.15-headers.patch deleted file mode 100644 index 77e4d91f4bf..00000000000 --- a/dev-tcltk/expect/files/expect-5.44.1.15-headers.patch +++ /dev/null @@ -1,86 +0,0 @@ -https://sourceforge.net/tracker/?func=detail&aid=3071706&group_id=13179&atid=113179 - ---- a/exp_clib.c -+++ b/exp_clib.c -@@ -15,6 +15,12 @@ - #endif - #include <sys/types.h> - #include <sys/ioctl.h> -+#ifdef HAVE_UNISTD_H -+# include <unistd.h> -+#endif -+#ifdef HAVE_SYS_WAIT_H -+#include <sys/wait.h> -+#endif - - #ifdef TIME_WITH_SYS_TIME - # include <sys/time.h> ---- a/exp_trap.c -+++ b/exp_trap.c -@@ -13,6 +13,7 @@ - #include <stdio.h> - #include <signal.h> - #include <sys/types.h> -+#include <string.h> - - #ifdef HAVE_SYS_WAIT_H - #include <sys/wait.h> ---- a/pty_termios.c -+++ b/pty_termios.c -@@ -9,6 +9,8 @@ - - #include <stdio.h> - #include <signal.h> -+#include <string.h> -+#include <pty.h> - - #if defined(SIGCLD) && !defined(SIGCHLD) - #define SIGCHLD SIGCLD -@@ -100,6 +100,7 @@ - - #include "exp_tty_in.h" - #include "exp_rename.h" -+#include "exp_int.h" - #include "exp_pty.h" - - void expDiagLog(); ---- a/exp_chan.c -+++ b/exp_chan.c -@@ -34,6 +34,7 @@ - #include "exp_rename.h" - #include "exp_prog.h" - #include "exp_command.h" -+#include "exp_event.h" - #include "exp_log.h" - #include "tcldbg.h" /* Dbg_StdinMode */ - ---- a/exp_clib.c -+++ b/exp_clib.c -@@ -1955,6 +1955,7 @@ - - #include "expect.h" - #include "exp_int.h" -+EXTERN void exp_init_tty _ANSI_ARGS_((void)); - - /* exp_glob.c - expect functions for doing glob - * ---- a/exp_tty.h -+++ b/exp_tty.h -@@ -17,6 +17,7 @@ - - void exp_tty_raw(int set); - void exp_tty_echo(int set); -+int exp_tty_cooked_echo(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo); - void exp_tty_break(Tcl_Interp *interp, int fd); - int exp_tty_raw_noecho(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo); - int exp_israw(void); ---- a/exp_main_tk.c -+++ b/exp_main_tk.c -@@ -32,6 +32,7 @@ - static char sccsid[] = "@(#) tkAppInit.c 1.19 95/12/23 17:09:24"; - #endif /* not lint */ - -+#include <string.h> - #include <ctype.h> - - #include "tk.h" diff --git a/dev-tcltk/expect/files/expect-5.44.1.15_with-tk-no.patch b/dev-tcltk/expect/files/expect-5.44.1.15_with-tk-no.patch deleted file mode 100644 index cea372daaac..00000000000 --- a/dev-tcltk/expect/files/expect-5.44.1.15_with-tk-no.patch +++ /dev/null @@ -1,117 +0,0 @@ -This is a minimal patch that does not keep indentation consistent in tcl.m4 -Updating indentation would make the patch much bigger and less readable. - -Signed-off-by: Gilles Espinasse <g....@free.fr> - -Index: INSTALL -=================================================================== -RCS file: /cvsroot/expect/expect/INSTALL,v -retrieving revision 5.30 -diff -u -r5.30 INSTALL ---- INSTALL 21 Jun 1999 18:41:41 -0000 5.30 -+++ INSTALL 30 May 2009 11:51:21 -0000 -@@ -152,6 +152,7 @@ - - --with-tk=... Specifies the directory containing Tk's - configure file (tkConfig.sh). -+ --with-tk=no disable Tk usage in expect - - --with-tkinclude=... Specifies the directory containing Tk's - private include files (such as tkInt.h) -Index: Makefile.in -=================================================================== -RCS file: /cvsroot/expect/expect/Makefile.in,v -retrieving revision 5.45 -diff -u -r5.45 Makefile.in ---- Makefile.in 3 Oct 2008 17:05:14 -0000 5.45 -+++ Makefile.in 30 May 2009 11:51:21 -0000 -@@ -103,7 +103,11 @@ - PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@ - - lib_BINARIES = $(PKG_LIB_FILE) --bin_BINARIES = expect expectk -+bin_BINARIES = expect -+ifneq ($(TK_BIN_DIR),) -+ bin_BINARIES += expectk -+endif -+ - BINARIES = $(lib_BINARIES) $(bin_BINARIES) - - SHELL = @SHELL@ -Index: tclconfig/tcl.m4 -=================================================================== -RCS file: /cvsroot/expect/expect/tclconfig/tcl.m4,v -retrieving revision 1.3 -diff -u -r1.3 tcl.m4 ---- tclconfig/tcl.m4 25 Jan 2006 21:52:11 -0000 1.3 -+++ tclconfig/tcl.m4 30 May 2009 11:51:23 -0000 -@@ -181,10 +181,12 @@ - # - # Adds the following arguments to configure: - # --with-tk=... -+# --with-tk=no disable Tk usage - # - # Defines the following vars: - # TK_BIN_DIR Full path to the directory containing - # the tkConfig.sh file -+# Empty if Tk is disabled - #------------------------------------------------------------------------ - - AC_DEFUN(TEA_PATH_TKCONFIG, [ -@@ -201,6 +203,12 @@ - AC_HELP_STRING([--with-tk], - [directory containing tk configuration (tkConfig.sh)]), - with_tkconfig=${withval}) -+ -+ if test x"${with_tkconfig}" = x"no" ; then -+ AC_MSG_RESULT([Tk is disabled by --with-tk=no]) -+ unset TK_BIN_DIR -+ else -+ - AC_MSG_CHECKING([for Tk configuration]) - AC_CACHE_VAL(ac_cv_c_tkconfig,[ - -@@ -309,6 +317,7 @@ - TK_BIN_DIR=${ac_cv_c_tkconfig} - AC_MSG_RESULT([found ${TK_BIN_DIR}/tkConfig.sh]) - fi -+ fi - fi - ]) - -@@ -420,6 +429,7 @@ - #------------------------------------------------------------------------ - - AC_DEFUN(TEA_LOAD_TKCONFIG, [ -+ if test x"${with_tkconfig}" != x"no" ; then - AC_MSG_CHECKING([for existence of ${TK_BIN_DIR}/tkConfig.sh]) - - if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then -@@ -501,6 +511,7 @@ - - AC_SUBST(TK_LIBS) - AC_SUBST(TK_XINCLUDES) -+ fi - ]) - - #------------------------------------------------------------------------ -@@ -3528,6 +3539,11 @@ - #------------------------------------------------------------------------ - - AC_DEFUN(TEA_PUBLIC_TK_HEADERS, [ -+ if test x"${with_tkconfig}" = x"no" ; then -+ TK_INCLUDES="" -+ AC_SUBST(TK_INCLUDES) -+ else -+ - AC_MSG_CHECKING([for Tk public headers]) - - AC_ARG_WITH(tkinclude, [ --with-tkinclude directory containing the public Tk header files.], with_tkinclude=${withval}) -@@ -3608,6 +3624,7 @@ - fi - AC_MSG_RESULT([${INCLUDE_DIR_NATIVE}]) - fi -+ fi - ]) - - #------------------------------------------------------------------------
