diff options
| author |   Seemant Kulleen <seemant@gentoo.org> | 2003-03-09 14:16:30 +0000 |
|---|---|---|
| committer | Seemant Kulleen <seemant@gentoo.org> | 2003-03-09 14:16:30 +0000 |
| commit | ae4e26cbb742153e453766439ee4b2052ef88f4f (patch) | |
| tree | 7c0462f2b1554bce7345e01d5d107bd04b926c8d /x11-base | |
| parent | add some patches to libtool (diff) | |
| download | gentoo-2-ae4e26cbb742153e453766439ee4b2052ef88f4f.tar.gz gentoo-2-ae4e26cbb742153e453766439ee4b2052ef88f4f.tar.bz2 gentoo-2-ae4e26cbb742153e453766439ee4b2052ef88f4f.zip | |
sparc keyboard fixes
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xfree/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xfree/files/4.3.0-patches/XFree86-4.3.0-sparc-kb.patch | 39 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.3.0-r1.ebuild | 10 |
3 files changed, 52 insertions, 3 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 21bb877885d1..8c49fb8caf65 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,10 +1,14 @@ # ChangeLog for x11-base/xfree # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.106 2003/03/09 13:36:53 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.107 2003/03/09 14:16:30 seemant Exp $ *xfree-4.3.0-r1 (09 Mar 2003) 09 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r1.ebuild: + added a patch for sparc keyboards from the xfree86 mailing list: + http://www.mail-archive.com/devel%40xfree86.org/msg01156.html + + 09 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r1.ebuild: Luca Barbato <lu_zero@gentoo.org> added some fixes for radeon issues 08 Mar 2003; Daniel Robbins <drobbins@gentoo.org> xfree-4.3.0.ebuild: unset diff --git a/x11-base/xfree/files/4.3.0-patches/XFree86-4.3.0-sparc-kb.patch b/x11-base/xfree/files/4.3.0-patches/XFree86-4.3.0-sparc-kb.patch new file mode 100644 index 000000000000..88515889a1a2 --- /dev/null +++ b/x11-base/xfree/files/4.3.0-patches/XFree86-4.3.0-sparc-kb.patch @@ -0,0 +1,39 @@ +diff -ur xc.orig/programs/Xserver/hw/xfree86/common/xf86Events.c xc/programs/Xserver/hw/xfree86/common/xf86Events.c +--- xc.orig/programs/Xserver/hw/xfree86/common/xf86Events.c 2003-02-19 20:20:52.000000000 -0800 ++++ xc/programs/Xserver/hw/xfree86/common/xf86Events.c 2003-03-09 06:06:08.000000000 -0800 +@@ -535,6 +535,17 @@ + } + + /* ++ * PC keyboards generate separate key codes for ++ * Alt+Print and Control+Pause but in the X keyboard model ++ * they need to get the same key code as the base key on the same ++ * physical keyboard key. ++ */ ++ if (scanCode == KEY_SysReqest) ++ scanCode = KEY_Print; ++ else if (scanCode == KEY_Break) ++ scanCode = KEY_Pause; ++ ++ /* + * and now get some special keysequences + */ + +@@ -827,17 +838,6 @@ + #ifdef XKB + } + #endif +- +- /* +- * PC keyboards generate separate key codes for +- * Alt+Print and Control+Pause but in the X keyboard model +- * they need to get the same key code as the base key on the same +- * physical keyboard key. +- */ +- if (scanCode == KEY_SysReqest) +- scanCode = KEY_Print; +- else if (scanCode == KEY_Break) +- scanCode = KEY_Pause; + + /* + * Now map the scancodes to real X-keycodes ... diff --git a/x11-base/xfree/xfree-4.3.0-r1.ebuild b/x11-base/xfree/xfree-4.3.0-r1.ebuild index 3f1970348cc4..ef9c1638dbf3 100644 --- a/x11-base/xfree/xfree-4.3.0-r1.ebuild +++ b/x11-base/xfree/xfree-4.3.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r1.ebuild,v 1.1 2003/03/09 13:36:53 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r1.ebuild,v 1.2 2003/03/09 14:16:30 seemant Exp $ # Make sure Portage does _NOT_ strip symbols. We will do it later and make sure # that only we only strip stuff that are safe to strip ... @@ -182,7 +182,13 @@ src_unpack() { # Fix HOME and END keys to work in xterm, bug #15254 epatch ${FILESDIR}/xfree-4.2.x-home_end-keys.patch cd ${S}/programs/Xserver/hw/xfree86/ - patch -p0 < ${DISTDIR}/xfree86-dri-resume-v8.patch + epatch ${DISTDIR}/xfree86-dri-resume-v8.patch + + # Fix keyboard issue on sparc + if use sparc; then + cd ${S} + epatch ${FILESDIR}/${PV}-patches/XFree86-${PV}-sparc-kb.patch + fi # Update the Savage Driver # savage driver 1.1.27t is a .zip and contains a savage directory |