--- ./zvt/zvtterm.c Mon May 6 18:23:39 2002 +++ ../gnome-libs-1.4.1.7/./zvt/zvtterm.c Fri Jun 14 12:17:03 2002 @@ -2960,8 +2960,17 @@ if (event->state & (GDK_MOD1_MASK | GDK_MOD4_MASK)){ *p++ = '\033'; } +#ifdef __sgi + if ((event->state & GDK_CONTROL_MASK) && (event->length == 1)) { + *p++ = event->keyval & 0x1f; + } else { + memcpy(p, event->string, event->length*sizeof(char)); + p += event->length; + } +#else memcpy(p, event->string, event->length*sizeof(char)); p += event->length; +#endif } else { handled = FALSE; } --- ./zvt/subshell-includes.h Thu Jun 14 20:04:52 2001 +++ ../gnome-libs-1.4.1.7/./zvt/subshell-includes.h Fri Jun 14 12:17:46 2002 @@ -4,7 +4,9 @@ #include #include /* for close-on-exec stuff */ #ifndef _XOPEN_SOURCE +#ifndef __sgi #define _XOPEN_SOURCE 1 +#endif #endif #define __EXTENSIONS__ 1 /* needed for winsize struct on Solaris (?) */ --- ./zvt/subshell.c Sat May 20 00:36:33 2000 +++ ../gnome-libs-1.4.1.7/./zvt/subshell.c Fri Jun 14 12:18:05 2002 @@ -39,7 +39,7 @@ /* The socketpair used for the protocol */ int helper_socket_protocol [2]; -/* The paralell socketpair used to transfer file descriptors */ +/* The parallel socketpair used to transfer file descriptors */ int helper_socket_fdpassing [2]; /* List of all subshells we're watching */ --- ./zvt/gnome-pty-helper.c Sun Nov 25 05:05:45 2001 +++ ../gnome-libs-1.4.1.7/./zvt/gnome-pty-helper.c Fri Jun 14 12:18:43 2002 @@ -30,7 +30,9 @@ /* Use this to pull SCM_RIGHTS definition on IRIX */ #if defined(irix) || defined (__irix__) || defined(sgi) || defined (__sgi__) +# ifdef HAVE_SENDMSG # define _XOPEN_SOURCE 1 +# endif extern char *strdup(const char *); #endif --- ./support/Makefile.am Wed Sep 19 15:03:28 2001 +++ ../gnome-libs-1.4.1.7/./support/Makefile.am Fri Jun 14 12:19:09 2002 @@ -22,7 +22,7 @@ popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c -libgnomesupport_la_LIBADD = @LTLIBOBJS@ +libgnomesupport_la_LIBADD = @LTLIBOBJS@ $(INTLLIBS) libgnomesupport_la_LDFLAGS = -version-info 0:0:0 BUILT_SOURCES = gnomesupport.h --- ./support/Makefile.in Tue May 21 15:23:06 2002 +++ ../gnome-libs-1.4.1.7/./support/Makefile.in Fri Jun 14 12:19:24 2002 @@ -171,7 +171,7 @@ popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c -libgnomesupport_la_LIBADD = @LTLIBOBJS@ +libgnomesupport_la_LIBADD = @LTLIBOBJS@ $(INTLLIBS) libgnomesupport_la_LDFLAGS = -version-info 0:0:0 BUILT_SOURCES = gnomesupport.h --- ./libgnome/Makefile.am Wed Mar 27 01:51:57 2002 +++ ../gnome-libs-1.4.1.7/./libgnome/Makefile.am Fri Jun 14 12:19:45 2002 @@ -87,7 +87,7 @@ gnome-config.o: parse-path.cP libgnome_la_LDFLAGS = -version-info 36:3:4 #-rpath $(libdir) -libgnome_la_LIBADD = $(GLIB_LIBS) -lm +libgnome_la_LIBADD = $(GLIB_LIBS) $(INTLLIBS) -lm bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \ gconfigger gnome-gen-mimedb --- ./libgnome/Makefile.in Tue May 21 15:23:12 2002 +++ ../gnome-libs-1.4.1.7/./libgnome/Makefile.in Fri Jun 14 12:19:54 2002 @@ -238,7 +238,7 @@ EXTRA_DIST = parse-path.cP $(man_MANS) libgnome_la_LDFLAGS = -version-info 36:3:4 #-rpath $(libdir) -libgnome_la_LIBADD = $(GLIB_LIBS) -lm +libgnome_la_LIBADD = $(GLIB_LIBS) $(INTLLIBS) -lm bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \ gconfigger gnome-gen-mimedb --- ./libgnorba/Makefile.am Wed Mar 27 01:48:18 2002 +++ ../gnome-libs-1.4.1.7/./libgnorba/Makefile.am Fri Jun 14 12:20:31 2002 @@ -10,7 +10,7 @@ goad-browser.1 \ loadshlib.1 \ new-object.1 - + EXTRA_DIST = yes.xpm no.xpm $(man_MANS) INCLUDES = \ @@ -80,7 +80,7 @@ Table.h libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir) -libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm +libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) $(INTLLIBS) -lm loadshlib_SOURCES = loadshlib.c --- ./libgnorba/Makefile.in Tue May 21 15:23:20 2002 +++ ../gnome-libs-1.4.1.7/./libgnorba/Makefile.in Fri Jun 14 12:20:38 2002 @@ -229,7 +229,7 @@ libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir) -libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm +libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) $(INTLLIBS) -lm loadshlib_SOURCES = loadshlib.c --- ./libgnomeui/Makefile.am Wed Mar 27 01:49:42 2002 +++ ../gnome-libs-1.4.1.7/./libgnomeui/Makefile.am Fri Jun 14 12:20:56 2002 @@ -268,7 +268,7 @@ $(man_MANS) libgnomeui_la_LDFLAGS = -version-info 46:1:14 -rpath $(libdir) -libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) +libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) $(INTLLIBS) gnome_segv_LDADD = \ libgnomeui.la \ --- ./libgnomeui/Makefile.in Tue May 21 15:23:15 2002 +++ ../gnome-libs-1.4.1.7/./libgnomeui/Makefile.in Fri Jun 14 12:21:03 2002 @@ -392,7 +392,7 @@ libgnomeui_la_LDFLAGS = -version-info 46:1:14 -rpath $(libdir) -libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) +libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) $(INTLLIBS) gnome_segv_LDADD = \ libgnomeui.la \ --- ./ltmain.sh Wed Mar 27 01:43:48 2002 +++ ../gnome-libs-1.4.1.7/./ltmain.sh Fri Jun 14 20:20:42 2002 @@ -61,7 +61,7 @@ default_mode= help="Try \`$progname --help' for more information." magic="%%%MAGIC variable%%%" -mkdir="mkdir" +mkdir="mkdir -p" mv="mv -f" rm="rm -f"