Cleanroom reimplementation of changes to xterm
The attached patch implements the requested changes to xterm.
> * I affirm that this modification is my own work.
Affirmed.
> * I affirm that I have not consulted source code more recent than
> 2004-02-12 from an XFree86 source code release or repository in the
> preparation of this modification.
Affirmed.
> * I affirm that I have not consulted source code more recent than
> 2004-02-12 from Thomas Dickey's source releases of XTerm.
Affirmed.
> * I refuse to assert copyright in this modification. If I am unable
> within a given legal jurisdiction to disclaim copyright in this
> modification, I hereby place it in the public domain. If I am unable
> within a given legal jurisdiction to place this modification in the
> public domain, I release this modification to the public under the
> following terms:
>
> Permission is hereby granted, free of charge, to any person obtaining a
> copy of this software and associated documentation files (the
> "Software"), to deal in the Software without restriction, including
> without limitation the rights to use, copy, modify, merge, publish,
> distribute, sublicense, and/or sell copies of the Software, and to
> permit persons to whom the Software is furnished to do so, subject to
> the following conditions:
>
> The above copyright notice and this permission notice shall be included
> in all copies or substantial portions of the Software.
>
> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
> IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
> CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
> TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
> SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
I agree to this.
I am not subscribed to debian-x, so please CC me on any replies.
- Josh Triplett
diff -Naur xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
--- xc.orig/programs/xterm/Imakefile 2003-12-11 19:22:02.000000000 -0800
+++ xc/programs/xterm/Imakefile 2004-05-12 10:53:32.000000000 -0700
@@ -195,7 +195,7 @@
#endif
#endif
#endif
-install:: ProgramTargetName(xterm)
+install::
MakeDir($(DESTDIR)$(BINDIR))
RemoveFile(ProgramTargetName(xterm.inst))
LinkRule(ProgramTargetName(xterm.inst),$(CDEBUGFLAGS) $(CCOPTIONS)
diff -Naur xc.orig/programs/xterm/resize.c xc/programs/xterm/resize.c
--- xc.orig/programs/xterm/resize.c 2003-03-22 18:01:40.000000000 -0800
+++ xc/programs/xterm/resize.c 2004-05-12 10:54:22.000000000 -0700
@@ -69,7 +69,7 @@
#endif
#ifndef USE_TERMINFO /* avoid conflict with configure script */
-#if defined(__QNX__) || defined(SCO) || defined(sco) || defined(linux) || defined(__OpenBSD__)
+#if defined(__QNX__) || defined(__SCO__) || defined(linux) || defined(__OpenBSD__)
#define USE_TERMINFO
#endif
#endif
diff -Naur xc.orig/programs/xterm/xterm_io.h xc/programs/xterm/xterm_io.h
--- xc.orig/programs/xterm/xterm_io.h 2004-01-06 20:28:07.000000000 -0800
+++ xc/programs/xterm/xterm_io.h 2004-05-12 10:54:34.000000000 -0700
@@ -68,7 +68,7 @@
#define USE_TERMIOS
#endif
-#ifdef SCO325
+#ifdef __SCO__
#define USE_TERMIOS
#define _SVID3
#endif
@@ -160,7 +160,7 @@
#ifdef SYSV
#ifdef USE_USG_PTYS
#include <sys/stream.h> /* get typedef used in ptem.h */
-#if !defined(SVR4) || defined(SCO325)
+#if !defined(SVR4) || defined(__SCO__)
#include <sys/ptem.h> /* get struct winsize */
#endif
#endif /* USE_USG_PTYS */
Reply to: