summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wever <weeve@gentoo.org>2004-04-24 15:50:40 +0000
committerJason Wever <weeve@gentoo.org>2004-04-24 15:50:40 +0000
commitb4ed686992ff27363238f40f9bc21d3d7cdbc1ea (patch)
treec73b17a9b8f33aa4abc14c75dded269fc22dee80 /x11-libs
parentAdding wolfmp wolfsp einfo at end of install and closing bug #48864. (diff)
downloadhistorical-b4ed686992ff27363238f40f9bc21d3d7cdbc1ea.tar.gz
historical-b4ed686992ff27363238f40f9bc21d3d7cdbc1ea.tar.bz2
historical-b4ed686992ff27363238f40f9bc21d3d7cdbc1ea.zip
Added todd's fixes to 1.02.
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/libxklavier/ChangeLog6
-rw-r--r--x11-libs/libxklavier/Manifest5
-rw-r--r--x11-libs/libxklavier/files/sun-keymaps-102.patch16
-rw-r--r--x11-libs/libxklavier/libxklavier-1.02.ebuild4
4 files changed, 26 insertions, 5 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/Manifest b/x11-libs/libxklavier/Manifest
index 08525ad1f197..513eea741395 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,8 +1,9 @@
-MD5 51f84522f27d807575828e32d10cc7d9 ChangeLog 1359
+MD5 a2aa55902a677122ed8efb57003497cc ChangeLog 1489
MD5 5dd33daf58e9e76b7d7b342d1dcc4c45 libxklavier-1.00.ebuild 952
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 0874eb2ff772862c356d833785a43aee libxklavier-1.02.ebuild 941
+MD5 dbce27e2519d12de35ace6b7990649c0 libxklavier-1.02.ebuild 941
MD5 42251f44e8d527c6d0e52153529841a2 files/digest-libxklavier-1.00 68
MD5 95f50dc00a9778b6f862c56e0c990b3f files/sun-keymaps.patch 940
MD5 10d8c674e282f71c1dd0e11903e86e7d files/sun.xml 4572
MD5 2ee4cc635af9abc1de963e4d38525430 files/digest-libxklavier-1.02 68
+MD5 554177dc558823391aea91515efb3902 files/sun-keymaps-102.patch 687
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() {