[patch] add support for the Dell Inspiron 5100

xkeycaps.ebuild-2.patch (text/plain), 8.96 KB, created by xv3ctor on 2004-11-20 23:25:11 UTC

diff -Nru xkeycaps/Manifest xkeycaps.new/Manifest
--- xkeycaps/Manifest	2004-11-21 02:12:49.896470984 -0500
+++ xkeycaps.new/Manifest	2004-11-21 02:09:45.320530792 -0500
@@ -1,7 +1,10 @@
 MD5 c93e7b10bd101940bb80fe39c4e0c366 xkeycaps-2.46-r1.ebuild 923
 MD5 ad1c61c4ac3bc036569f3c61f1780927 xkeycaps-2.46.ebuild 863
+MD5 1492d7afe79a402dab8899bdab73a8db xkeycaps-2.46-r2.ebuild 974
 MD5 f1e503f3104e544677d3b77a316ed915 ChangeLog 1434
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
+MD5 14830479461edc7d2a6fcf42e9a0784b files/xkeycaps-inspiron5100.patch 6279
 MD5 95672a6aa92eeb1fc9ab0cbcfb8d87a7 files/digest-xkeycaps-2.46-r1 64
+MD5 95672a6aa92eeb1fc9ab0cbcfb8d87a7 files/digest-xkeycaps-2.46-r2 64
 MD5 95672a6aa92eeb1fc9ab0cbcfb8d87a7 files/digest-xkeycaps-2.46 64
 MD5 f22d961023c7dc9527a112fb95edd8cd files/Imakefile.patch 664
diff -Nru xkeycaps/files/digest-xkeycaps-2.46-r2 xkeycaps.new/files/digest-xkeycaps-2.46-r2
--- xkeycaps/files/digest-xkeycaps-2.46-r2	1969-12-31 19:00:00.000000000 -0500
+++ xkeycaps.new/files/digest-xkeycaps-2.46-r2	2004-11-21 02:09:45.315531552 -0500
@@ -0,0 +1 @@
+MD5 6792f828db6538f44f7696a8783b44ac xkeycaps-2.46.tar.Z 489439
diff -Nru xkeycaps/files/xkeycaps-inspiron5100.patch xkeycaps.new/files/xkeycaps-inspiron5100.patch
--- xkeycaps/files/xkeycaps-inspiron5100.patch	1969-12-31 19:00:00.000000000 -0500
+++ xkeycaps.new/files/xkeycaps-inspiron5100.patch	2004-11-21 02:07:24.656914912 -0500
@@ -0,0 +1,172 @@
+diff -Nru xkeycaps-2.46.old/kbds/all-kbds.h xkeycaps-2.46/kbds/all-kbds.h
+--- xkeycaps-2.46.old/kbds/all-kbds.h	1999-12-12 20:13:39.000000000 -0500
++++ xkeycaps-2.46/kbds/all-kbds.h	2004-11-21 02:00:13.403475400 -0500
+@@ -151,6 +151,15 @@
+ #endif
+ 
+ #ifdef KBD
++  KBD ("insp5100", "Dell", "Inspiron 5100 (XFree86; US)", 0,
++       &insp5100_geom, insp5100_caps, insp5100_codes, xfree86us_map),
++#else
++# include "dell_inspiron5100-caps.h"
++# include "dell_inspiron5100-codes.h"
++# include "dell_inspiron5100-geom.h"
++#endif
++
++#ifdef KBD
+   KBD ("LK201", "Digital", "LK201 (US)", "Digital Equipment Corporation",
+        &lk201_geom, lk201_caps, lk201_codes, lk201_map),
+ #else
+diff -Nru xkeycaps-2.46.old/kbds/dell_inspiron5100-caps.h xkeycaps-2.46/kbds/dell_inspiron5100-caps.h
+--- xkeycaps-2.46.old/kbds/dell_inspiron5100-caps.h	1969-12-31 19:00:00.000000000 -0500
++++ xkeycaps-2.46/kbds/dell_inspiron5100-caps.h	2004-11-21 02:01:36.190889800 -0500
+@@ -0,0 +1,51 @@
++/* xkeycaps, Copyright (c) 1994, ..., 1999 Jamie Zawinski <[e-mail]>
++ *
++ * This file describes what is printed on the keycaps of a Dell Inspiron 5100 keyboard.
++ * The file was edited by <[e-mail]>
++ */
++
++static const struct key_strings insp5100_caps [] = {
++
++   /* Row 1  */
++
++   {"Esc", "Suspend", 0}, {"F1", 0, 0}, {"F2", 0, 0}, {"F3", 0, 0},
++   {"F4", 0, 0}, {"F5", 0, 0}, {"F6", 0, 0},
++   {"F7", 0, 0}, {"F8", "CRT/LCD", 0}, {"F9", 0, 0},
++   {"F10", "CD Eject", 0}, {"F11", "Num Lk", 0}, {"F12", "Scroll Lk", 0},
++   {"~", "`", 0}, {"Pause", "Break", 0}, {"Win", 0, 0},
++   {"Menu", 0, 0},
++
++   /* Row 2 */
++
++   {"!", "1", 0}, {"@", "2", 0}, {"#", "3", 0}, {"$", "4", 0}, {"%", "5", 0},
++   {"^", "6", 0}, {"&", "7", "7"}, {"*", "8", "8"}, {"(", "9", "9"},
++   {")", "0", "/"}, {"-", "_", 0}, {"+", "=", 0}, {"<-- Backspace", 0, 0},
++   {"Home", 0, 0},
++
++   /* Row 3 */
++
++   {"Tab", "|<- ->|", 0}, {"Q", 0, 0}, {"W", 0, 0}, {"E", 0, 0}, {"R", 0, 0},
++   {"T", 0, 0}, {"Y", 0, 0}, {"U", 0, "4"}, {"I", 0, "5"}, {"O", 0, "6"},
++   {"P", 0, "*"}, {"{", "[", 0}, {"}", "]", 0}, {"|", "\\", 0}, {"PgUp", "Vol Up", 0},
++
++   /* Row 4 */
++
++   {"Caps Lock", 0, 0}, {"A", 0, 0}, {"S", 0, 0}, {"D", 0, 0}, {"F", 0, 0},
++   {"G", 0, 0}, {"H", 0, 0}, {"J", 0, "1"}, {"K", 0, "2"}, {"L", 0, "3"},
++   {":", ";", "-"}, {"\"", "'", 0}, {"<--| Enter", 0, 0}, {"PgDn", "Vol Dn", 0},
++
++   /* Row 5 */
++
++   {"Shift", 0}, {"Z", 0, 0}, {"X", 0, 0}, {"C", 0, 0}, {"V", 0, 0},
++   {"B", 0, 0}, {"N", 0, 0}, {"M", 0, "0"}, {"<", ",", 0}, {">", ".", "."},
++   {"?", "/", "+"}, {"Shift", 0, 0}, {"UpArrow", "Bright Up", 0},
++   {"End", "Mute", 0},
++
++   /* Row 6 */
++
++   {"Ctrl", 0, 0}, {"Fn", 0, 0}, {"Alt", 0, 0}, {"Space", 0, 0}, {"Alt", 0, 0},
++   {"Ctrl", 0, 0}, {"Insert", "Prnt Scrn", 0}, {"Delete", "SysRq", 0},
++   {"LeftArrow", 0, 0}, {"Bright Dn", "DownArrow", 0},
++   {"RightArrow", 0, 0}
++
++};
+diff -Nru xkeycaps-2.46.old/kbds/dell_inspiron5100-codes.h xkeycaps-2.46/kbds/dell_inspiron5100-codes.h
+--- xkeycaps-2.46.old/kbds/dell_inspiron5100-codes.h	1969-12-31 19:00:00.000000000 -0500
++++ xkeycaps-2.46/kbds/dell_inspiron5100-codes.h	2004-11-21 02:02:28.812890040 -0500
+@@ -0,0 +1,28 @@
++/* xkeycaps, Copyright (c) 1994, ..., 1999 Jamie Zawinski <[e-mail]>
++ *
++ * This file describes the keycodes for the Dell Insipron 5100 keyboard.
++ * File edited by <[e-mail]>.
++ *
++ */
++
++static const KeyCode insp5100_codes [] = {
++
++ /* Row 1 */
++ 9, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 95, 96, 49, 110, 115, 117,
++
++ /* Row 2 */
++ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 97,
++
++ /* Row 3 */
++ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 51, 99,
++
++ /* Row 4 */
++ 66, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 36, 105,
++
++ /* Row 5 */
++  50, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 98, 103,
++
++ /* Row 6 */
++ 37, 0, 64, 65, 113, 109, 106, 107, 100, 104, 102
++
++ };
+diff -Nru xkeycaps-2.46.old/kbds/dell_inspiron5100-geom.h xkeycaps-2.46/kbds/dell_inspiron5100-geom.h
+--- xkeycaps-2.46.old/kbds/dell_inspiron5100-geom.h	1969-12-31 19:00:00.000000000 -0500
++++ xkeycaps-2.46/kbds/dell_inspiron5100-geom.h	2004-11-21 02:03:13.811049280 -0500
+@@ -0,0 +1,62 @@
++/* xkeycaps, Copyright (c) 1991, ..., 1999 Jamie Zawinski <[e-mail]>
++ *
++ * This file specifies the geometry of a keyboard that comes
++ * with a Dell Inspiron 5100 laptop.
++ * File edited by <[e-mail]>.
++ */
++
++static const struct key_geometry insp5100_row1 [] = {
++ {15, 15}, {5, 0},
++ {15, 15}, {15, 15}, {15, 15}, {15, 15}, {4, 0},
++ {15, 15}, {15, 15}, {15, 15}, {15, 15}, {5, 0},
++ {15, 15}, {15, 15}, {15, 15}, {15, 15}, {5, 0},
++ {15, 15}, {15, 15}, {15, 15}, {15, 15}
++};
++
++static const struct key_geometry insp5100_row2 [] = {
++ {8, 0}, /* this corresponds to an empty space on the kbd */
++ {18, 18}, {18, 18}, {18, 18}, {18, 18}, {18, 18}, {18, 18},
++ {18, 18}, {18, 18}, {18, 18}, {18, 18}, {18, 18}, {18, 18},
++ {34, 18}, {16, 18},
++};
++
++static const struct key_geometry insp5100_row3 [] = {
++ {18, 18}, {18, 18}, {18, 18}, {18, 18}, {18, 18}, {18, 18},
++ {18, 18}, {18, 18}, {18, 18}, {18, 18}, {18, 18}, {18, 18},
++ {18, 18}, {24, 18}, {16, 18}
++};
++
++static const struct key_geometry insp5100_row4 [] = {
++ {22, 18}, {18, 18}, {18, 18}, {18, 18}, {18, 18}, {18, 18},
++ {18, 18}, {18, 18}, {18, 18}, {18, 18}, {18, 18}, {18, 18},
++ {38, 18}, {16,18}
++};
++
++static const struct key_geometry insp5100_row5 [] = {
++ {33, 18}, {18, 18}, {18, 18}, {18, 18}, {18, 18}, {18, 18},
++ {18, 18}, {18, 18}, {18, 18}, {18, 18}, {18, 18}, {29, 18},
++ {16, 18}, {16, 18}
++};
++
++static const struct key_geometry insp5100_row6 [] = {
++ {22, 18}, {22, 18}, {18, 18}, {92, 18},
++ {18, 18}, {18, 18}, {18, 18}, {18, 18}, {16, 18}, {16, 18},
++ {16, 18}
++};
++
++static const struct keyboard_row_geometry insp5100_rows [] = {
++  ROW (insp5100_row1, 15),
++  ROW (insp5100_row2, 18),
++  ROW (insp5100_row3, 18),
++  ROW (insp5100_row4, 18),
++  ROW (insp5100_row5, 18),
++  ROW (insp5100_row6, 18),
++};
++
++/* The following is not documented in the file defining.txt. */
++/* What exactly does this do and do I have to have it here?  */
++
++static const struct keyboard_geometry insp5100_geom = {
++  sizeof (insp5100_rows) / sizeof (struct keyboard_row_geometry),
++  insp5100_rows, 3, 1, 1
++};
diff -Nru xkeycaps/xkeycaps-2.46-r2.ebuild xkeycaps.new/xkeycaps-2.46-r2.ebuild
--- xkeycaps/xkeycaps-2.46-r2.ebuild	1969-12-31 19:00:00.000000000 -0500
+++ xkeycaps.new/xkeycaps-2.46-r2.ebuild	2004-11-21 02:08:46.648450304 -0500
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/xkeycaps-2.46.ebuild,v 1.15 2004/06/24 22:41:44 agriffis Exp $
+
+inherit eutils
+
+DESCRIPTION="GUI frontend to xmodmap"
+SRC_URI="http://www.jwz.org/${PN}/${P}.tar.Z"
+HOMEPAGE="http://www.jwz.org/xkeycaps/"
+
+LICENSE="as-is"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+SLOT="0"
+IUSE=""
+
+RDEPEND="virtual/x11"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/Imakefile.patch
+	epatch ${FILESDIR}/xkeycaps-inspiron5100.patch
+}
+
+src_compile() {
+	xmkmf || die
+	sed -i \
+		-e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \
+		Makefile || \
+			die "sed Makefile failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR=${D} install.man || die "make install failed"
+	dodoc README *.txt        || die "dodoc failed"
+}