rpms/xkeyboard-config/OLPC-2 xkeyboard-config-olpc-af-AE09.patch, NONE, 1.1 xkeyboard-config-olpc-kh-olpc-section-add.patch, NONE, 1.1 xkeyboard-config-olpc-misc.patch, NONE, 1.1 xkeyboard-config.spec, 1.17, 1.18
Dennis Gilmore (ausil)
fedora-extras-commits at redhat.com
Thu Feb 7 19:17:57 UTC 2008
Author: ausil
Update of /cvs/extras/rpms/xkeyboard-config/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21069
Modified Files:
xkeyboard-config.spec
Added Files:
xkeyboard-config-olpc-af-AE09.patch
xkeyboard-config-olpc-kh-olpc-section-add.patch
xkeyboard-config-olpc-misc.patch
Log Message:
apply patches for http://dev.laptop.org/ticket/6159
xkeyboard-config-olpc-af-AE09.patch:
--- NEW FILE xkeyboard-config-olpc-af-AE09.patch ---
//Correcting mapping of AE09 in olpc-ps section of af layout
Index: symbols/af
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/af,v
retrieving revision 1.9
diff -u -r1.9 af
--- symbols/af 31 Jan 2008 22:05:30 -0000 1.9
+++ symbols/af 5 Feb 2008 06:49:36 -0000
@@ -225,7 +225,7 @@
key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six
key <AE07> { [ 0x10006F7, guillemotright, ampersand ] }; // Arabic seven
key <AE08> { [ 0x10006F8, guillemotleft, 0x100066D ] }; // Arabic eight, Arabic five-pointed star
- key <AE09> { [ 0x10006F9, parenright ] }; // Arabic nine
+ key <AE09> { [ 0x10006F9, parenright, enfilledcircbullet ] }; // Arabic nine
key <AE10> { [ 0x10006F0, parenleft, degree ] }; // Arabic zero
key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
key <AE12> { [ plus, equal, division ] };
xkeyboard-config-olpc-kh-olpc-section-add.patch:
--- NEW FILE xkeyboard-config-olpc-kh-olpc-section-add.patch ---
//Adding olpc section for kh layout
Index: rules/base.lists.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.lists.part,v
retrieving revision 1.57
diff -u -r1.57 base.lists.part
--- rules/base.lists.part 31 Jan 2008 22:05:30 -0000 1.57
+++ rules/base.lists.part 4 Feb 2008 23:11:36 -0000
@@ -15,7 +15,7 @@
! $pcgeometries = abnt2 latitude jp106 kr106
// Layouts that provide further specializations for the OLPC
-! $olpclayouts = af am ara br es et kz in mn np ru th tr us
+! $olpclayouts = af am ara br es et kh kz in mn np ru th tr us
! $macbooks = macbook78 macbook79
! $maclaptop = ibook powerbook macbook78 macbook79
Index: symbols/kh
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/kh,v
retrieving revision 1.2
diff -u -r1.2 kh
--- symbols/kh 31 Dec 2005 02:02:46 -0000 1.2
+++ symbols/kh 4 Feb 2008 23:11:36 -0000
@@ -96,3 +96,19 @@
include "level3(ralt_switch)"
};
+
+partial default alphanumeric_keys
+xkb_symbols "olpc" {
+ include "kh(basic)"
+
+// Contact Walter at laptop.org
+
+ key <AE01> { [ 0x10017e1, 0x100200c, exclam, 0x10017f1 ] };
+ key <AE03> { [ 0x10017e3, 0x10017d1, quotedbl, 0x10017f3 ] };
+ key <AE05> { [ 0x10017e5, EuroSign, percent, 0x10017f5 ] };
+ key <AE12> { [ 0x10017b2, 0x10017ce, equal, voidsymbol ] };
+ key <AC10> { [ 0x10017be, 0x10017c8, 0x10017d6, 0x10019f5 ] };
+
+ //language key
+ include "group(olpc)"
+};
xkeyboard-config-olpc-misc.patch:
--- NEW FILE xkeyboard-config-olpc-misc.patch ---
Index: symbols/af
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/af,v
retrieving revision 1.2
@@ -1,4 +1,4 @@
-// $XKeyboardConfig: xkbdesc/xkeyboard-config/symbols/af,v 1.3 2007-11-20 22:00:07 svu Exp $
+// $XKeyboardConfig: xkeyboard-config/symbols/af,v 1.9 2008-01-31 22:05:30 svu Exp $
//
// Keymap for the Afghan dari keybord layout
// Based on the specification "Computer Locale Requirements for
@@ -228,7 +228,7 @@
key <AE09> { [ 0x10006F9, parenright ] }; // Arabic nine
key <AE10> { [ 0x10006F0, parenleft, degree ] }; // Arabic zero
key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
- key <AE12> { [ plus, equal, slash ] };
+ key <AE12> { [ plus, equal, division ] };
key <AD01> { [ 0x1000636, 0x1000652, EuroSign ] }; // Arabic dad, Arabic sukun
key <AD02> { [ 0x1000635, 0x100064C, 0x1000671 ] }; // Arabic sad, Arabic dammatan, Arabic alef walsa
@@ -269,8 +269,7 @@
key <AB09> { [ 0x1000696, 0x100002E, 0x10006C7 ] }; // Arabic reh with dot below and dot above, full stop, Arabic letter U
key <AB10> { [ slash, 0x100061F, 0x10006C9 ] }; // Arabic question mark, Arabic kirghiz yu
- //language key
- key <I219> { [ISO_Next_Group , ISO_Prev_Group ] };
+ include "group(olpc)"
};
partial alphanumeric_keys
@@ -278,7 +277,7 @@
name[Group1]= "Afghanistan - Dari";
- key <TLDE> { [ 0x100200D, slash, asciitilde ] }; // zero width joiner
+ key <TLDE> { [ 0x100200D, division, asciitilde ] }; // zero width joiner
key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one
key <AE02> { [ 0x10006F2, 0x100066C, at ] }; // Arabic two, Arabic thousands separator
key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator
@@ -286,7 +285,7 @@
key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign
key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six
key <AE07> { [ 0x10006F7, 0x100060C, ampersand ] }; // Arabic seven, Arabic comma
- key <AE08> { [ 0x10006F8, asterisk ] }; // Arabic eight,
+ key <AE08> { [ 0x10006F8, asterisk, enfilledcircbullet ] }; // Arabic eight,
key <AE09> { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark
key <AE10> { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark
key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
@@ -331,8 +330,7 @@
key <AB09> { [ period, less, 0x10006C7 ] }; // Arabic u
key <AB10> { [ slash, 0x100061F, 0x10006C9 ] }; // Arabic question mark, Arabic kirghiz yu
- //language key
- key <I219> { [ ISO_Next_Group, ISO_Prev_Group ] };
+ include "group(olpc)"
};
partial alphanumeric_keys
@@ -340,7 +338,7 @@
name[Group1]= "Afghanistan - Uzbek";
- key <TLDE> { [ 0x100200D, slash, asciitilde ] }; // zero width joiner
+ key <TLDE> { [ 0x100200D, division, asciitilde ] }; // zero width joiner
key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one
key <AE02> { [ 0x10006F2, 0x100066C, at ] }; // Arabic two, Arabic thousands separator
key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator
@@ -348,7 +346,7 @@
key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign
key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six
key <AE07> { [ 0x10006F7, 0x100060C, ampersand ] }; // Arabic seven, Arabic comma
- key <AE08> { [ 0x10006F8, asterisk ] }; // Arabic eight,
+ key <AE08> { [ 0x10006F8, asterisk, enfilledcircbullet ] }; // Arabic eight,
key <AE09> { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark
key <AE10> { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark
key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
@@ -393,6 +391,5 @@
key <AB09> { [ period, less ] };
key <AB10> { [ slash, 0x100061F, 0x1000655 ] }; // Arabic question mark, Arabic hamza below
- //language key
- key <I219> { [ ISO_Next_Group, ISO_Prev_Group ] };
+ include "group(olpc)"
};
Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xkeyboard-config.spec 3 Feb 2008 12:59:32 -0000 1.17
+++ xkeyboard-config.spec 7 Feb 2008 19:17:18 -0000 1.18
@@ -23,6 +23,9 @@
Patch7: xkeyboard-config-olpc-af.patch
Patch8: xkeyboard-config-olpc-af-leftout.patch
Patch9: xkeyboard-config-olpc-af-updated-changes.patch
+Patch10: xkeyboard-config-olpc-misc.patch
+Patch11: xkeyboard-config-olpc-af-AE09.patch
+Patch12: xkeyboard-config-olpc-kh-olpc-section-add.patch
BuildArch: noarch
@@ -61,6 +64,9 @@
%patch7 -p0 -b .af
%patch8 -p0 -b .afl
%patch9 -p0 -b .afuc
+%patch10 -p0 -b .misc
+%patch11 -p0 -b .ae09
+%patch12 -p0 -b .kh
%build
%configure \
@@ -100,6 +106,9 @@
%{_datadir}/X11/xkb/rules/xorg.xml
%changelog
+* Thu Feb 07 2008 Dennis Gilmore <dennis at ausil.us> 1.1-11.20071130cvs
+- add patches from arjs for http://dev.laptop.org/ticket/6159
+
* Sat Feb 02 2008 Bernardo Innocenti <bernie at codewiz.org> 1.1-10.20071130cvs
- Add xkeyboard-config-olpc-mn.patch
- Add xkeyboard-config-olpc-af.patch
More information about the fedora-extras-commits
mailing list