diff options
author | 2004-04-24 15:50:40 +0000 | |
---|---|---|
committer | 2004-04-24 15:50:40 +0000 | |
commit | d9dfcf74cb81b37201edcbc215149c97987d7e2f (patch) | |
tree | d7d3257fb5e4089abf871796382e1b4e9c4dda7a /x11-libs/libxklavier | |
parent | Adding wolfmp wolfsp einfo at end of install and closing bug #48864. (Manifes... (diff) | |
download | gentoo-2-d9dfcf74cb81b37201edcbc215149c97987d7e2f.tar.gz gentoo-2-d9dfcf74cb81b37201edcbc215149c97987d7e2f.tar.bz2 gentoo-2-d9dfcf74cb81b37201edcbc215149c97987d7e2f.zip |
Added todd's fixes to 1.02.
Diffstat (limited to 'x11-libs/libxklavier')
-rw-r--r-- | x11-libs/libxklavier/ChangeLog | 6 | ||||
-rw-r--r-- | x11-libs/libxklavier/files/sun-keymaps-102.patch | 16 | ||||
-rw-r--r-- | x11-libs/libxklavier/libxklavier-1.02.ebuild | 4 |
3 files changed, 23 insertions, 3 deletions
diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog index b86bcacebc3b..e3fcb74c47bf 100644 --- a/x11-libs/libxklavier/ChangeLog +++ b/x11-libs/libxklavier/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libxklavier # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.11 2004/04/20 01:24:52 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.12 2004/04/24 15:50:40 weeve Exp $ + + 24 Apr 2004; Jason Wever <weeve@gentoo.org> +files/sun-keymaps-102.patch, + libxklavier-1.02.ebuild: + Added todd's fixes to 1.02. 19 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> libxklavier-1.02.ebuild: diff --git a/x11-libs/libxklavier/files/sun-keymaps-102.patch b/x11-libs/libxklavier/files/sun-keymaps-102.patch new file mode 100644 index 000000000000..680907bde6af --- /dev/null +++ b/x11-libs/libxklavier/files/sun-keymaps-102.patch @@ -0,0 +1,16 @@ +diff -Nura libxklavier-1.02/libxklavier/xklavier_config_xkb.c libxklavier-1.02.sun/libxklavier/xklavier_config_xkb.c +--- libxklavier-1.02/libxklavier/xklavier_config_xkb.c 2004-04-13 17:20:36.000000000 -0400 ++++ libxklavier-1.02.sun/libxklavier/xklavier_config_xkb.c 2004-04-24 04:38:50.660469000 -0400 +@@ -18,9 +18,9 @@ + #endif + + // For "bad" X servers we hold our own copy +-#define XML_CFG_FALLBACK_PATH ( DATA_DIR "/xfree86.xml" ) ++#define XML_CFG_FALLBACK_PATH ( DATA_DIR "/sun.xml" ) + +-#define MULTIPLE_LAYOUTS_CHECK_PATH ( XKB_BASE "/symbols/pc/en_US" ) ++#define MULTIPLE_LAYOUTS_CHECK_PATH ( XKB_BASE "/symbols/sun/us" ) + + #define XK_XKB_KEYS + #include <X11/keysymdef.h> + diff --git a/x11-libs/libxklavier/libxklavier-1.02.ebuild b/x11-libs/libxklavier/libxklavier-1.02.ebuild index da971adac1cd..968e95cbb309 100644 --- a/x11-libs/libxklavier/libxklavier-1.02.ebuild +++ b/x11-libs/libxklavier/libxklavier-1.02.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-1.02.ebuild,v 1.3 2004/04/20 01:24:52 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-1.02.ebuild,v 1.4 2004/04/24 15:50:40 weeve Exp $ inherit eutils @@ -24,7 +24,7 @@ src_unpack() { unpack ${A} cd ${S} - use sparc && epatch "${FILESDIR}/sun-keymaps.patch" + use sparc && epatch "${FILESDIR}/sun-keymaps-102.patch" } src_compile() { |