rpms/xkeyboard-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update macbook patch to be closer to what got in upstream

Browse Source 
- (kp enter is ralt, not the option key)
This commit is contained in:
Alexander Larsson 2006-09-01 10:52:10 +00:00
parent 46d6014061
commit f099b19b2c
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
xkeyboard-config-0.8-macbook.patch
View File

@ -1,6 +1,5 @@
diff -urN xkb.orig/geometry/macbook xkb/geometry/macbook --- /dev/null 2006-08-28 15:22:40.902752500 +0200
--- xkeyboard-config-0.8/geometry/macbook 1970-01-01 01:00:00.000000000 +0100 +++ xkeyboard-config-0.8/geometry/macbook 2006-09-01 12:39:19.000000000 +0200
+++ xkeyboard-config-0.8/geometry/macbook.macbook 2006-08-29 16:02:05.000000000 +0200
@@ -0,0 +1,237 @@ @@ -0,0 +1,237 @@
+xkb_geometry "macbook79" { +xkb_geometry "macbook79" {
+ +
@ -239,8 +238,8 @@ diff -urN xkb.orig/geometry/macbook xkb/geometry/macbook
+ alias <AA00> = <LCTL>; + alias <AA00> = <LCTL>;
+ +
+}; +};
--- xkeyboard-config-0.8/geometry/Makefile.am.macbook 2006-08-29 19:31:46.000000000 +0200 --- xkeyboard-config-0.8/geometry/Makefile.am.macbook 2005-09-21 23:29:24.000000000 +0200
+++ xkeyboard-config-0.8/geometry/Makefile.am 2006-08-29 19:31:57.000000000 +0200 +++ xkeyboard-config-0.8/geometry/Makefile.am 2006-09-01 12:39:19.000000000 +0200
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
amiga ataritt chicony \ amiga ataritt chicony \
dell everex fujitsu \ dell everex fujitsu \
@ -251,7 +250,7 @@ diff -urN xkb.orig/geometry/macbook xkb/geometry/macbook
sun winbook README sun winbook README
--- xkeyboard-config-0.8/symbols/altwin.macbook 2005-10-01 14:20:31.000000000 +0200 --- xkeyboard-config-0.8/symbols/altwin.macbook 2005-10-01 14:20:31.000000000 +0200
+++ xkeyboard-config-0.8/symbols/altwin 2006-08-29 19:30:42.000000000 +0200 +++ xkeyboard-config-0.8/symbols/altwin 2006-09-01 12:39:19.000000000 +0200
@@ -58,3 +58,14 @@ @@ -58,3 +58,14 @@
modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R }; modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R };
modifier_map Mod4 { Super_L, Super_R }; modifier_map Mod4 { Super_L, Super_R };
@ -268,14 +267,16 @@ diff -urN xkb.orig/geometry/macbook xkb/geometry/macbook
+ modifier_map Mod4 { Meta_L, Meta_R }; + modifier_map Mod4 { Meta_L, Meta_R };
+}; +};
--- xkeyboard-config-0.8/symbols/macintosh_vndr/apple.macbook 2005-09-21 23:29:25.000000000 +0200 --- xkeyboard-config-0.8/symbols/macintosh_vndr/apple.macbook 2005-09-21 23:29:25.000000000 +0200
+++ xkeyboard-config-0.8/symbols/macintosh_vndr/apple 2006-08-29 19:30:42.000000000 +0200 +++ xkeyboard-config-0.8/symbols/macintosh_vndr/apple 2006-09-01 12:43:02.000000000 +0200
@@ -3,6 +3,12 @@ @@ -3,6 +3,14 @@
// //
// $XFree86: xc/programs/xkbcomp/symbols/apple,v 1.2 2003/10/24 20:38:20 tsi Exp $ // $XFree86: xc/programs/xkbcomp/symbols/apple,v 1.2 2003/10/24 20:38:20 tsi Exp $
+// MacBook/MacBook Pro +// MacBook/MacBook Pro
+xkb_symbols "macbook" { +xkb_symbols "macbook" {
+ key <K6C> { [ XF86Eject ] }; + key <K6C> { [ XF86Eject ] };
+ replace key <KPEN> { [ ISO_Level3_Shift ] };
+ modifier_map Mod2 { ISO_Level3_Shift };
+}; +};
+ +
+ +
@ -283,8 +284,8 @@ diff -urN xkb.orig/geometry/macbook xkb/geometry/macbook
xkb_symbols "extended" { xkb_symbols "extended" {
--- xkeyboard-config-0.8/keycodes/xfree86.macbook 2005-09-21 23:29:24.000000000 +0200 --- xkeyboard-config-0.8/keycodes/xfree86.macbook 2005-09-21 23:29:24.000000000 +0200
+++ xkeyboard-config-0.8/keycodes/xfree86 2006-08-29 19:30:42.000000000 +0200 +++ xkeyboard-config-0.8/keycodes/xfree86 2006-09-01 12:41:12.000000000 +0200
@@ -412,4 +412,13 @@ @@ -412,4 +412,11 @@
<KPPT> = 134; <KPPT> = 134;
}; };
@ -294,12 +295,10 @@ diff -urN xkb.orig/geometry/macbook xkb/geometry/macbook
+// Macbook keyboards switch TLDE and LSGT keycodes +// Macbook keyboards switch TLDE and LSGT keycodes
+ <TLDE> = 94; + <TLDE> = 94;
+ <LSGT> = 49; + <LSGT> = 49;
+// Use the right apple key as right alt to get mode shift 3
+ <RALT> = 116;
+}; +};
--- xkeyboard-config-0.8/rules/base.ml_s.part.macbook 2006-01-15 00:47:48.000000000 +0100 --- xkeyboard-config-0.8/rules/base.ml_s.part.macbook 2006-01-15 00:47:48.000000000 +0100
+++ xkeyboard-config-0.8/rules/base.ml_s.part 2006-08-29 19:30:42.000000000 +0200 +++ xkeyboard-config-0.8/rules/base.ml_s.part 2006-09-01 12:39:19.000000000 +0200
@@ -13,6 +13,8 @@ @@ -13,6 +13,8 @@
old_macintosh $macvendorlayouts = macintosh_vndr/us(extended)+macintosh_vndr/%l%(v) old_macintosh $macvendorlayouts = macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
old_macintosh $nonlatin = macintosh_vndr/us(extended)+%l%(v):2 old_macintosh $nonlatin = macintosh_vndr/us(extended)+%l%(v):2
@ -310,7 +309,7 @@ diff -urN xkb.orig/geometry/macbook xkb/geometry/macbook
$mac $macvendorlayouts = pc(pc105)+macintosh_vndr/%l%(v) $mac $macvendorlayouts = pc(pc105)+macintosh_vndr/%l%(v)
$pcmodels intl = us(%mcompose) $pcmodels intl = us(%mcompose)
--- xkeyboard-config-0.8/rules/base.m_g.part.macbook 2005-09-21 23:29:25.000000000 +0200 --- xkeyboard-config-0.8/rules/base.m_g.part.macbook 2005-09-21 23:29:25.000000000 +0200
+++ xkeyboard-config-0.8/rules/base.m_g.part 2006-08-29 19:30:42.000000000 +0200 +++ xkeyboard-config-0.8/rules/base.m_g.part 2006-09-01 12:39:19.000000000 +0200
@@ -13,5 +13,6 @@ @@ -13,5 +13,6 @@
winbook = winbook(XP5) winbook = winbook(XP5)
pc98 = nec(pc98) pc98 = nec(pc98)
@ -319,7 +318,7 @@ diff -urN xkb.orig/geometry/macbook xkb/geometry/macbook
$mac = macintosh(macintosh) $mac = macintosh(macintosh)
* = pc(pc104) * = pc(pc104)
--- xkeyboard-config-0.8/rules/base.o_s.part.macbook 2005-09-23 00:21:08.000000000 +0200 --- xkeyboard-config-0.8/rules/base.o_s.part.macbook 2005-09-23 00:21:08.000000000 +0200
+++ xkeyboard-config-0.8/rules/base.o_s.part 2006-08-29 19:30:42.000000000 +0200 +++ xkeyboard-config-0.8/rules/base.o_s.part 2006-09-01 12:39:19.000000000 +0200
@@ -43,6 +43,7 @@ @@ -43,6 +43,7 @@
altwin:super_win = +altwin(super_win) altwin:super_win = +altwin(super_win)
altwin:hyper_win = +altwin(hyper_win) altwin:hyper_win = +altwin(hyper_win)
@ -329,7 +328,7 @@ diff -urN xkb.orig/geometry/macbook xkb/geometry/macbook
compose:rwin = +compose(rwin) compose:rwin = +compose(rwin)
compose:menu = +compose(menu) compose:menu = +compose(menu)
--- xkeyboard-config-0.8/rules/base.m_k.part.macbook 2006-02-22 00:52:07.000000000 +0100 --- xkeyboard-config-0.8/rules/base.m_k.part.macbook 2006-02-22 00:52:07.000000000 +0100
+++ xkeyboard-config-0.8/rules/base.m_k.part 2006-08-29 19:30:42.000000000 +0200 +++ xkeyboard-config-0.8/rules/base.m_k.part 2006-09-01 12:39:19.000000000 +0200
@@ -8,4 +8,5 @@ @@ -8,4 +8,5 @@
abnt2 = xfree86(abnt2) abnt2 = xfree86(abnt2)
jp106 = xfree86(jp106) jp106 = xfree86(jp106)
@ -337,7 +336,7 @@ diff -urN xkb.orig/geometry/macbook xkb/geometry/macbook
+ $macbooks = xfree86(macbook) + $macbooks = xfree86(macbook)
* = xfree86 * = xfree86
--- xkeyboard-config-0.8/rules/base.lists.part.macbook 2006-01-14 23:22:13.000000000 +0100 --- xkeyboard-config-0.8/rules/base.lists.part.macbook 2006-01-14 23:22:13.000000000 +0100
+++ xkeyboard-config-0.8/rules/base.lists.part 2006-08-29 19:30:42.000000000 +0200 +++ xkeyboard-config-0.8/rules/base.lists.part 2006-09-01 12:39:19.000000000 +0200
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
// ru scc sy syr tel th tj tam ua uz // ru scc sy syr tel th tj tam ua uz
@ -346,9 +345,8 @@ diff -urN xkb.orig/geometry/macbook xkb/geometry/macbook
! $maclaptop = ibook powerbook ! $maclaptop = ibook powerbook
! $mac = macintosh macintosh_old ibook powerbook ! $mac = macintosh macintosh_old ibook powerbook
diff -urN xkb.orig/rules/base xkb/rules/base --- xkeyboard-config-0.8/rules/base.macbook 2006-09-01 12:39:19.000000000 +0200
--- xkeyboard-config-0.8/rules/base.macbook 2006-08-29 17:54:26.000000000 +0200 +++ xkeyboard-config-0.8/rules/base 2006-09-01 12:39:19.000000000 +0200
+++ xkeyboard-config-0.8/rules/base 2006-08-29 17:46:53.000000000 +0200
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
// ru scc sy syr tel th tj tam ua uz // ru scc sy syr tel th tj tam ua uz
@ -390,8 +388,8 @@ diff -urN xkb.orig/rules/base xkb/rules/base
compose:ralt = +compose(ralt) compose:ralt = +compose(ralt)
compose:rwin = +compose(rwin) compose:rwin = +compose(rwin)
compose:menu = +compose(menu) compose:menu = +compose(menu)
--- xkeyboard-config-0.8/rules/base.xml.in.macbook 2006-08-29 19:30:42.000000000 +0200 --- xkeyboard-config-0.8/rules/base.xml.in.macbook 2006-09-01 12:39:19.000000000 +0200
+++ xkeyboard-config-0.8/rules/base.xml.in 2006-08-29 19:30:42.000000000 +0200 +++ xkeyboard-config-0.8/rules/base.xml.in 2006-09-01 12:39:19.000000000 +0200
@@ -676,6 +676,18 @@ @@ -676,6 +676,18 @@
</model> </model>
<model> <model>

6
xkeyboard-config.spec
View File

@ -4,7 +4,7 @@
Summary: xkeyboard-config alternative xkb data files Summary: xkeyboard-config alternative xkb data files
Name: xkeyboard-config Name: xkeyboard-config
Version: 0.8 Version: 0.8
Release: 6%{?dist} Release: 7%{?dist}
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
@ -98,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/X11/xkb/rules/xorg.xml %{_datadir}/X11/xkb/rules/xorg.xml
%changelog %changelog
* Fri Sep 1 2006 Alexander Larsson <alexl@redhat.com> - 0.8-7
- Update macbook patch to be closer to what got in upstream
- (kp enter is ralt, not the option key)
* Fri Sep 1 2006 Matthias Clasen <mclasen@redhat.com> - 0.8-6 * Fri Sep 1 2006 Matthias Clasen <mclasen@redhat.com> - 0.8-6
- Add support for Korean 106 key keyboards (204158) - Add support for Korean 106 key keyboards (204158)