bugfixes

4 files changed, 56 insertions, 7 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 46d4970827e8..eeec61cfa2ca 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.57 2002/11/04 11:37:16 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.58 2002/11/05 12:56:16 azarah Exp $
+
+  5 Nov 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r1.ebuild :
+
+  Fix backspace in xterm not working.  This closes bug #10186.
+  Added patch 108_all_4.2.1-xterm-enable-backspace.patch.
+  
+  Fix xterm exiting immediately on PPC.  Closes bug #10245.
+  Also see http://www.geocrawler.com/archives/3/3/2001/9/100/6633199/
+  Added patch 109_ppc_4.2.1-xterm-eightBitInput-fix.patch.
 
   4 Nov 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r1.ebuild :
 
diff --git a/x11-base/xfree/files/4.2.1-r1/108_all_4.2.1-xterm-enable-backspace.patch b/x11-base/xfree/files/4.2.1-r1/108_all_4.2.1-xterm-enable-backspace.patch
new file mode 100644
index 000000000000..2b34350d3a96
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-r1/108_all_4.2.1-xterm-enable-backspace.patch
@@ -0,0 +1,11 @@
+--- xc/programs/xterm/XTerm.ad.orig	2002-11-05 14:26:19.000000000 +0200
++++ xc/programs/xterm/XTerm.ad	2002-11-05 14:26:43.000000000 +0200
+@@ -141,7 +141,7 @@
+ *VT100*colorBD: blue3
+ 
+ ! keyboard setup
+-*VT100*backarrowKey: false
++*VT100*backarrowKey: true
+ 
+ !This can be useful if you have an IntelliMouse.  It maps the button
+ !events generated by the wheel
diff --git a/x11-base/xfree/files/4.2.1-r1/109_ppc_4.2.1-xterm-eightBitInput-fix.patch b/x11-base/xfree/files/4.2.1-r1/109_ppc_4.2.1-xterm-eightBitInput-fix.patch
new file mode 100644
index 000000000000..d41025ed05da
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-r1/109_ppc_4.2.1-xterm-eightBitInput-fix.patch
@@ -0,0 +1,12 @@
+--- xc/programs/xterm/XTerm.ad.orig	2002-11-05 14:38:21.000000000 +0200
++++ xc/programs/xterm/XTerm.ad	2002-11-05 14:39:34.000000000 +0200
+@@ -179,7 +179,8 @@
+ *VT100*scrollBar: true
+ 
+ ! Bug fix for bugzilla bug #49315
+-*VT100*eightBitInput: false
++! This breaks things on PPC, bug #10245.
++*VT100*eightBitInput: true
+ 
+ 
+ 
diff --git a/x11-base/xfree/xfree-4.2.1-r1.ebuild b/x11-base/xfree/xfree-4.2.1-r1.ebuild
index 25413b32b084..df8952b9edea 100644
--- a/x11-base/xfree/xfree-4.2.1-r1.ebuild
+++ b/x11-base/xfree/xfree-4.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r1.ebuild,v 1.4 2002/11/04 11:59:30 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r1.ebuild,v 1.5 2002/11/05 12:56:16 azarah Exp $
 
 IUSE="sse nls mmx truetype 3dnow 3dfx"
 
@@ -207,6 +207,20 @@ src_unpack() {
 			[ "${count}" -eq 5 ] && die "Failed Patch: ${x##*/}!"
 		fi
 	done
+	# Fix backspace in xterm not working.  This should be fixed in
+	# 002_all_4.2.0-xtermresources.patch with next revision.  Closes
+	# bug #10186.
+	einfo "  108_all_4.2.1-xterm-enable-backspace.patch.bz2..."
+	patch -p1 < ${FILESDIR}/${PVR}/108_all_4.2.1-xterm-enable-backspace.patch \
+		> /dev/null || die
+	# Fix xterm exiting immediately on PPC.  Closes bug #10245.
+	# Also see http://www.geocrawler.com/archives/3/3/2001/9/100/6633199/
+	einfo "  109_ppc_4.2.1-xterm-eightBitInput-fix.patch.bz2..."
+	if [ "${ARCH}" = "ppc" ]
+	then
+		patch -p1 < ${FILESDIR}/${PVR}/109_ppc_4.2.1-xterm-eightBitInput-fix.patch \
+			> /dev/null || die
+	fi
 	ebegin "Done with patching"; eend 0
 
 	# Update the Savage Driver
@@ -318,12 +332,15 @@ src_unpack() {
 	eend 0
 
 	# These are not included anymore as they are obsolete
-	rm -rf ${S}/xc/doc/hardcopy/{XIE,PEX5}
-	for x in ${S}/xc/programs/Xserver/hw/xfree86/{XF98Conf.cpp,XF98Config}
+	rm -rf ${S}/doc/hardcopy/{XIE,PEX5}
+	for x in ${S}/programs/Xserver/hw/xfree86/{XF98Conf.cpp,XF98Config}
 	do
-		cp ${x} ${x}.orig
-		grep -iv 'Load[[:space:]]*"\(pex5\|xie\)"' ${x}.orig > ${x}
-		rm -f ${x}.orig
+		if [ -f ${x} ]
+		then
+			cp ${x} ${x}.orig
+			grep -iv 'Load[[:space:]]*"\(pex5\|xie\)"' ${x}.orig > ${x}
+			rm -f ${x}.orig
+		fi
 	done
 
 	# Apply Xft quality patch from http://www.cs.mcgill.ca/~dchest/xfthack/