pool/xkeyboard-config
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=26

Browse Source
This commit is contained in:
OBS User unknown 2009-04-07 12:18:39 +00:00 committed by Git OBS Bridge
parent 30bce99aef
commit a4f4b8b5a1
15 changed files with 174 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MDSW-change-keycode.diff
View File

@ -1,5 +1,7 @@
--- keycodes/xfree86.orig 2008-05-14 06:17:28.000000000 +0200
+++ keycodes/xfree86 2008-05-14 06:21:33.000000000 +0200
Index: keycodes/xfree86
===================================================================
--- keycodes/xfree86.orig
+++ keycodes/xfree86
@@ -301,6 +301,9 @@ xkb_keycodes "basic" {
// MacBooks generate 0x65 for the lower brightness key
<II65> = 101;
@ -19,8 +21,10 @@
<LVL3> = 124; // <U7C>
<ALT> = 125; // <U7D>
<META> = 156; // <I1C>
--- symbols/inet.orig 2009-03-03 13:03:22.000000000 +0100
+++ symbols/inet 2009-03-03 13:28:20.000000000 +0100
Index: symbols/inet
===================================================================
--- symbols/inet.orig
+++ symbols/inet
@@ -1195,7 +1195,7 @@ xkb_symbols "logitech_g15" {
key <K72> { [ XF86LaunchC ] };
key <K74> { [ XF86WWW ] };

6
cs.po.diff
View File

@ -1,5 +1,7 @@
--- po/cs.po.orig 2009-03-03 13:31:59.000000000 +0000
+++ po/cs.po 2009-03-03 13:34:47.000000000 +0000
Index: po/cs.po
===================================================================
--- po/cs.po.orig
+++ po/cs.po
@@ -2622,10 +2622,6 @@ msgstr "qwerty/číslice"
msgid "qwertz"
msgstr "qwertz"

19
disable-2xalt_2xctrl-toggle.diff
View File

@ -1,19 +1,20 @@
diff -aurp xkeyboard-config-1.2/rules/base.xml.in xkeyboard-config-1.2-patched/rules/base.xml.in
--- xkeyboard-config-1.2/rules/base.xml.in 2008-01-08 00:08:25.000000000 +0100
+++ xkeyboard-config-1.2-patched/rules/base.xml.in 2008-05-13 13:13:23.870533000 +0200
@@ -3620,6 +3620,7 @@
<_description>Both Shift keys together change layout.</_description>
Index: xkeyboard-config-1.5/rules/base.xml.in
===================================================================
--- xkeyboard-config-1.5.orig/rules/base.xml.in
+++ xkeyboard-config-1.5/rules/base.xml.in
@@ -4132,6 +4132,7 @@
<_description>Right Alt (while pressed)</_description>
</configItem>
</option>
+ <!--
<option>
<configItem>
<name>grp:alts_toggle</name>
@@ -3632,6 +3633,7 @@
<_description>Both Ctrl keys together change layout.</_description>
<name>grp:lswitch</name>
@@ -4144,6 +4145,7 @@
<_description>Left Win (while pressed)</_description>
</configItem>
</option>
+ -->
<option>
<configItem>
<name>grp:ctrl_shift_toggle</name>
<name>grp:rwin_switch</name>

22
ibm_space_saver.diff
View File

@ -10,9 +10,9 @@ Index: rules/base.lists.part
===================================================================
--- rules/base.lists.part.orig
+++ rules/base.lists.part
@@ -56,6 +56,8 @@
@@ -64,6 +64,8 @@
toshiba_s3000 trust trustda \
yahoo
unitekkb1925 yahoo
+! $specialkbds = ibm_space_saver
+
@ -23,16 +23,17 @@ Index: rules/base.m_s.part
===================================================================
--- rules/base.m_s.part.orig
+++ rules/base.m_s.part
@@ -1,3 +1,4 @@
$inetkbds = +inet(%m)
@@ -1,4 +1,5 @@
a4techKB21 = +inet(media_nav_common)
+ $specialkbds = +group(%m)
$maclaptop = +inet(apple)+level3(enter_switch)
$macs = +inet(apple)
a4techKBS8 = +inet(media_nav_acpi_common)
a4_rfkb23 = +inet(media_nav_acpi_common)
asus_laptop = +inet(media_common)
Index: rules/base.xml.in
===================================================================
--- rules/base.xml.in.orig
+++ rules/base.xml.in
@@ -706,6 +706,12 @@
@@ -995,6 +995,12 @@
</model>
<model>
<configItem>
@ -44,12 +45,12 @@ Index: rules/base.xml.in
+ <configItem>
<name>macintosh</name>
<_description>Macintosh</_description>
</configItem>
<vendor>Apple</vendor>
Index: symbols/group
===================================================================
--- symbols/group.orig
+++ symbols/group
@@ -318,3 +318,8 @@ xkb_symbols "alt_caps_toggle" {
@@ -323,6 +323,11 @@ xkb_symbols "rctrl_toggle" {
};
};
@ -58,3 +59,6 @@ Index: symbols/group
+xkb_symbols "ibm_space_saver" {
+ key <NMLK> { [ Num_Lock, Num_Lock ] };
+};
// using the group(alt_caps_toggle) map, pressing:
// Alt+Caps Lock toggles group
// Caps Lock toggles caps lock

12
microsoftnek4k-keycodes.diff
View File

@ -1,6 +1,8 @@
--- keycodes/nek4k.orig 2008-03-10 17:49:17.000000000 +0100
+++ keycodes/nek4k 2008-03-10 18:28:50.000000000 +0100
@@ -2,10 +2,10 @@
Index: keycodes/nek4k
===================================================================
--- keycodes/nek4k.orig
+++ keycodes/nek4k
@@ -2,10 +2,10 @@ default xkb_keycodes "nek4k" {
<WEB> = 180;
<FIND> = 225;
@ -14,7 +16,7 @@
<PREV> = 166;
<SUCC> = 167;
@@ -21,13 +21,13 @@
@@ -21,13 +21,13 @@ default xkb_keycodes "nek4k" {
<CALC> = 148;
@ -34,7 +36,7 @@
<HELP> = 146;
<UNDO> = 139;
@@ -39,7 +39,7 @@
@@ -39,7 +39,7 @@ alias <BKMK> = <DOWN>;
<REPL> = 240;
<FWD> = 241;
<SEND> = 239;

17
microsoftnek4k-symbols.diff
View File

@ -1,6 +1,8 @@
--- symbols/inet.old 2008-03-10 15:30:06.000000000 +0100
+++ symbols/inet 2008-03-10 16:41:05.000000000 +0100
@@ -1726,37 +1726,37 @@
Index: symbols/inet
===================================================================
--- symbols/inet.orig
+++ symbols/inet
@@ -1391,37 +1391,39 @@ xkb_symbols "microsoftmult" {
// Microsoft Natural Ergonomic Keyboard 4000
partial alphanumeric_keys
xkb_symbols "microsoftnek4k" {
@ -66,15 +68,6 @@
+ key <SEND> { [ XF86Send ] };
+ key <SPLL> { [ XF86Spell ] };
+ key <SAVE> { [ XF86Save ] };
};
// Oretec
--- ../xkb.orig/symbols/inet 2008-03-10 18:40:39.000000000 +0100
+++ symbols/inet 2008-03-10 18:43:09.000000000 +0100
@@ -1757,6 +1757,8 @@
key <SEND> { [ XF86Send ] };
key <SPLL> { [ XF86Spell ] };
key <SAVE> { [ XF86Save ] };
+ key <I164> { [ XF86Favorites ] };
+ key <I218> { [ Print ] };
};

77
microsoftnek4k.diff
View File

@ -1,11 +1,8 @@
Index: geometry/microsoft
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/geometry/microsoft,v
retrieving revision 1.5
diff -u -r1.5 microsoft
--- geometry/microsoft 9 Oct 2007 20:56:16 -0000 1.5
+++ geometry/microsoft 8 Mar 2008 22:24:25 -0000
@@ -533,3 +533,43 @@
--- geometry/microsoft.orig
+++ geometry/microsoft
@@ -533,3 +533,43 @@ xkb_geometry "elite" {
alias <AC00> = <CAPS>;
alias <AA00> = <LCTL>;
};
@ -51,12 +48,9 @@ diff -u -r1.5 microsoft
+};
Index: keycodes/Makefile.am
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/keycodes/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- keycodes/Makefile.am 16 Oct 2006 19:04:52 -0000 1.6
+++ keycodes/Makefile.am 8 Mar 2008 22:24:25 -0000
@@ -11,6 +11,7 @@
--- keycodes/Makefile.am.orig
+++ keycodes/Makefile.am
@@ -11,6 +11,7 @@ fujitsu \
hp \
ibm \
macintosh \
@ -66,10 +60,8 @@ diff -u -r1.6 Makefile.am
xfree86 \
Index: keycodes/nek4k
===================================================================
RCS file: keycodes/nek4k
diff -N keycodes/nek4k
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ keycodes/nek4k 8 Mar 2008 22:24:25 -0000
--- /dev/null
+++ keycodes/nek4k
@@ -0,0 +1,45 @@
+default xkb_keycodes "nek4k" {
+
@ -118,14 +110,11 @@ diff -N keycodes/nek4k
+};
Index: rules/base.lists.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.lists.part,v
retrieving revision 1.62
diff -u -r1.62 base.lists.part
--- rules/base.lists.part 6 Mar 2008 22:20:16 -0000 1.62
+++ rules/base.lists.part 8 Mar 2008 22:24:25 -0000
@@ -51,6 +51,7 @@
--- rules/base.lists.part.orig
+++ rules/base.lists.part
@@ -52,6 +52,7 @@
logidinovo logidinovoedge \
microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
microsoftoffice microsoftmult \
+ microsoftnek4k \
mx1998 mx2500 mx2750 \
@ -133,11 +122,8 @@ diff -u -r1.62 base.lists.part
presario propeller \
Index: rules/base.m_g.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.m_g.part,v
retrieving revision 1.15
diff -u -r1.15 base.m_g.part
--- rules/base.m_g.part 7 Jan 2008 23:07:51 -0000 1.15
+++ rules/base.m_g.part 8 Mar 2008 22:24:25 -0000
--- rules/base.m_g.part.orig
+++ rules/base.m_g.part
@@ -1,5 +1,6 @@
microsoftelite = microsoft(elite)
$msmodels = microsoft(natural)
@ -147,11 +133,8 @@ diff -u -r1.15 base.m_g.part
flexpro = keytronic(FlexPro)
Index: rules/base.m_k.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.m_k.part,v
retrieving revision 1.15
diff -u -r1.15 base.m_k.part
--- rules/base.m_k.part 7 Jan 2008 23:07:52 -0000 1.15
+++ rules/base.m_k.part 8 Mar 2008 22:24:25 -0000
--- rules/base.m_k.part.orig
+++ rules/base.m_k.part
@@ -7,6 +7,7 @@
abnt2 = xfree86(abnt2)
jp106 = xfree86(jp106)
@ -162,12 +145,9 @@ diff -u -r1.15 base.m_k.part
macintosh_old = macintosh(old)
Index: rules/base.xml.in
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.xml.in,v
retrieving revision 1.245
diff -u -r1.245 base.xml.in
--- rules/base.xml.in 1 Mar 2008 21:01:56 -0000 1.245
+++ rules/base.xml.in 8 Mar 2008 22:24:25 -0000
@@ -835,6 +835,13 @@
--- rules/base.xml.in.orig
+++ rules/base.xml.in
@@ -862,6 +862,13 @@
</model>
<model>
<configItem>
@ -183,15 +163,12 @@ diff -u -r1.245 base.xml.in
<vendor>Ortek</vendor>
Index: symbols/inet
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/inet,v
retrieving revision 1.81
diff -u -r1.81 inet
--- symbols/inet 1 Mar 2008 21:01:56 -0000 1.81
+++ symbols/inet 8 Mar 2008 22:24:26 -0000
@@ -1704,6 +1704,42 @@
// My Computer Section -- Left Side
--- symbols/inet.orig
+++ symbols/inet
@@ -1388,6 +1388,42 @@ xkb_symbols "microsoftmult" {
};
+// Microsoft Natural Ergonomic Keyboard 4000
+partial alphanumeric_keys
+xkb_symbols "microsoftnek4k" {
@ -231,9 +208,11 @@ diff -u -r1.81 inet
// Oretec
// Oretec MCK-800 MM/Internet keyboard
--- keycodes/Makefile.in.orig 2008-03-08 22:45:22.000000000 +0000
+++ keycodes/Makefile.in 2008-03-08 22:46:01.000000000 +0000
@@ -222,6 +222,7 @@
Index: keycodes/Makefile.in
===================================================================
--- keycodes/Makefile.in.orig
+++ keycodes/Makefile.in
@@ -210,6 +210,7 @@ fujitsu \
hp \
ibm \
macintosh \

2
p_suse.diff
View File

@ -13,7 +13,7 @@ Index: symbols/pc
key <RTSH> { [ Shift_R ] };
- key <RCTL> { [ Control_R ] };
+ key <RCTL> { [ Control_R, Multi_key ] };
- key <RWIN> { [ Super_R ] };
+ key <RWIN> { [ Super_R, Multi_key ] };

102
ucw_suse.diff
View File

@ -1,8 +1,9 @@
diff -ur xkeyboard-config-1.3.orig/po/cs.po xkeyboard-config-1.3.suse/po/cs.po
--- xkeyboard-config-1.3.orig/po/cs.po 2008-05-18 00:57:03.000000000 +0200
+++ xkeyboard-config-1.3.suse/po/cs.po 2008-09-15 11:40:29.000000000 +0200
@@ -2585,3 +2585,11 @@
#: ../rules/base.xml.in.h:646
Index: xkeyboard-config-1.5/po/cs.po
===================================================================
--- xkeyboard-config-1.5.orig/po/cs.po
+++ xkeyboard-config-1.5/po/cs.po
@@ -2621,3 +2621,11 @@ msgstr "qwerty/číslice"
#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
msgid "qwertz"
msgstr "qwertz"
+
@ -13,10 +14,11 @@ diff -ur xkeyboard-config-1.3.orig/po/cs.po xkeyboard-config-1.3.suse/po/cs.po
+#: ../rules/base.xml.in.h:648
+msgid "CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action."
+msgstr "klávesa CapsLock přepne při stisknutí rozložení, Alt+CapsLock má původní význam capslock."
diff -ur xkeyboard-config-1.3.orig/rules/base.xml.in xkeyboard-config-1.3.suse/rules/base.xml.in
--- xkeyboard-config-1.3.orig/rules/base.xml.in 2008-09-12 16:23:05.000000000 +0200
+++ xkeyboard-config-1.3.suse/rules/base.xml.in 2008-09-15 15:24:15.000000000 +0200
@@ -1900,6 +1900,12 @@
Index: xkeyboard-config-1.5/rules/base.xml.in
===================================================================
--- xkeyboard-config-1.5.orig/rules/base.xml.in
+++ xkeyboard-config-1.5/rules/base.xml.in
@@ -3475,6 +3475,12 @@
<_description>qwerty, extended Backslash</_description>
</configItem>
</variant>
@ -29,7 +31,7 @@ diff -ur xkeyboard-config-1.3.orig/rules/base.xml.in xkeyboard-config-1.3.suse/r
</variantList>
</layout>
<layout>
@@ -3965,6 +3971,12 @@
@@ -4166,6 +4172,12 @@
</option>
<option>
<configItem>
@ -40,9 +42,9 @@ diff -ur xkeyboard-config-1.3.orig/rules/base.xml.in xkeyboard-config-1.3.suse/r
+ <option>
+ <configItem>
<name>grp:rctrl_switch</name>
<_description>Right Ctrl key switches layout while pressed.</_description>
<_description>Right Ctrl (while pressed)</_description>
</configItem>
@@ -4364,6 +4376,12 @@
@@ -4605,6 +4617,12 @@
</configItem>
</option>
<option>
@ -54,11 +56,12 @@ diff -ur xkeyboard-config-1.3.orig/rules/base.xml.in xkeyboard-config-1.3.suse/r
+ <option>
<configItem>
<name>caps:shiftlock</name>
<_description>CapsLock toggles Shift so all keys are affected.</_description>
diff -ur xkeyboard-config-1.3.orig/rules/compat/layoutRename.lst xkeyboard-config-1.3.suse/rules/compat/layoutRename.lst
--- xkeyboard-config-1.3.orig/rules/compat/layoutRename.lst 2007-10-04 23:01:47.000000000 +0200
+++ xkeyboard-config-1.3.suse/rules/compat/layoutRename.lst 2008-09-15 15:19:16.000000000 +0200
@@ -3,6 +3,7 @@
<_description>CapsLock toggles Shift so all keys are affected</_description>
Index: xkeyboard-config-1.5/rules/compat/layoutRename.lst
===================================================================
--- xkeyboard-config-1.5.orig/rules/compat/layoutRename.lst
+++ xkeyboard-config-1.5/rules/compat/layoutRename.lst
@@ -3,6 +3,7 @@ ben in(ben)
bs ba
cs rs
cz_qwerty cz(qwerty)
@ -66,13 +69,14 @@ diff -ur xkeyboard-config-1.3.orig/rules/compat/layoutRename.lst xkeyboard-confi
dev in(deva)
dvorak us(dvorak)
dzdwi bt
diff -ur xkeyboard-config-1.3.orig/symbols/capslock xkeyboard-config-1.3.suse/symbols/capslock
--- xkeyboard-config-1.3.orig/symbols/capslock 2007-12-27 23:47:04.000000000 +0100
+++ xkeyboard-config-1.3.suse/symbols/capslock 2008-09-15 14:10:27.000000000 +0200
@@ -22,3 +22,12 @@
key <CAPS> { [ Escape ] };
key <ESC> { [ Caps_Lock ] };
Index: xkeyboard-config-1.5/symbols/capslock
===================================================================
--- xkeyboard-config-1.5.orig/symbols/capslock
+++ xkeyboard-config-1.5/symbols/capslock
@@ -31,6 +31,15 @@ xkb_symbols "groupshift" {
};
};
+
+partial hidden modifier_keys
+xkb_symbols "groupshift" {
@ -82,21 +86,17 @@ diff -ur xkeyboard-config-1.3.orig/symbols/capslock xkeyboard-config-1.3.suse/sy
+ };
+};
+
diff -ur xkeyboard-config-1.3.orig/symbols/cz xkeyboard-config-1.3.suse/symbols/cz
--- xkeyboard-config-1.3.orig/symbols/cz 2008-02-16 01:53:45.000000000 +0100
+++ xkeyboard-config-1.3.suse/symbols/cz 2008-09-15 14:08:37.000000000 +0200
@@ -103,3 +103,42 @@
partial hidden modifier_keys
xkb_symbols "escape" {
key <CAPS> { [ Escape ] };
Index: xkeyboard-config-1.5/symbols/cz
===================================================================
--- xkeyboard-config-1.5.orig/symbols/cz
+++ xkeyboard-config-1.5/symbols/cz
@@ -111,6 +111,45 @@ xkb_symbols "ucw" {
// accented characters only, no 'latin' set.
// 2008 by Milan Vancura <mvancura@suse.cz>
key <BKSL> { [ backslash, bar, slash, NoSymbol ] };
};
+
+partial alphanumeric_keys alternate_group
+xkb_symbols "ucw" {
+
+ // This layout is usually used as the second group, it contains
+ // accented characters only, no 'latin' set.
+ // 2008 by Milan Vancura <mvancura@suse.cz>
+
+ name[Group1]= "Czechia - ucw";
+
+ key <AD01> { [adiaeresis, Adiaeresis ] };
@ -128,11 +128,23 @@ diff -ur xkeyboard-config-1.3.orig/symbols/cz xkeyboard-config-1.3.suse/symbols/
+ key <AB06> { [ncaron, Ncaron ] };
+ key <AB07> { [lacute, Lacute ] };
+};
diff -ur xkeyboard-config-1.3.orig/symbols/group xkeyboard-config-1.3.suse/symbols/group
--- xkeyboard-config-1.3.orig/symbols/group 2008-09-12 16:23:05.000000000 +0200
+++ xkeyboard-config-1.3.suse/symbols/group 2008-09-15 11:56:19.000000000 +0200
@@ -134,6 +134,16 @@
include "capslock(grouplock)"
+
+partial alphanumeric_keys alternate_group
+xkb_symbols "ucw" {
+
+ // This layout is usually used as the second group, it contains
+ // accented characters only, no 'latin' set.
+ // 2008 by Milan Vancura <mvancura@suse.cz>
+
name[Group1]= "Czechia - UCW layout (accented letters only)";
key <AB01> { [zcaron, Zcaron ] };
Index: xkeyboard-config-1.5/symbols/group
===================================================================
--- xkeyboard-config-1.5.orig/symbols/group
+++ xkeyboard-config-1.5/symbols/group
@@ -120,6 +120,16 @@ xkb_symbols "lctrl_lshift_toggle" {
key <LCTL> { [ Control_L, ISO_Next_Group ] };
};
+// using the group(caps_switch) map, pressing:
@ -148,8 +160,10 @@ diff -ur xkeyboard-config-1.3.orig/symbols/group xkeyboard-config-1.3.suse/symbo
// using the group(shift_caps_toggle) map, pressing:
// Shift+Caps Lock toggles group
partial modifier_keys
--- xkeyboard-config-1.5/rules/base.o_s.part.orig 2009-01-12 23:24:13.000000000 +0100
+++ xkeyboard-config-1.5/rules/base.o_s.part 2009-03-03 13:43:43.000000000 +0100
Index: xkeyboard-config-1.5/rules/base.o_s.part
===================================================================
--- xkeyboard-config-1.5.orig/rules/base.o_s.part
+++ xkeyboard-config-1.5/rules/base.o_s.part
@@ -13,6 +13,7 @@
grp:win_switch = +group(win_switch)
grp:lwin_switch = +group(lwin_switch)

5
xkeyboard-config.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Apr 6 15:32:55 CEST 2009 - eich@suse.de
- Update patches to apply without fuzz to current package.
-------------------------------------------------------------------
Tue Mar 3 12:52:55 CET 2009 - sndirsch@suse.de

6
xkeyboard-config.inet.patch
View File

@ -1,5 +1,7 @@
--- symbols/inet.orig 2009-01-12 23:24:13.000000000 +0100
+++ symbols/inet 2009-03-03 13:00:45.000000000 +0100
Index: symbols/inet
===================================================================
--- symbols/inet.orig
+++ symbols/inet
@@ -1689,6 +1689,7 @@ xkb_symbols "apple" {
key <I58> { [ XF86Launch1 ] };
key <I59> { [ XF86Launch2 ] };

14
xkeyboard-config.macintosh.patch
View File

@ -12,13 +12,19 @@ Index: rules/base.ml_s.part
===================================================================
--- rules/base.ml_s.part.orig
+++ rules/base.ml_s.part
@@ -16,3 +16,3 @@
@@ -17,7 +17,7 @@
macintosh_old $nonlatin = macintosh_vndr/us(oldmac)+%l%(v):2
macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v)
$macs en_US = pc+macintosh_vndr/us(extended)
- $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)
+ $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)+altwin(swap_lalt_lwin)+level3(alt_switch)
* jp = pc+jp(latin)+jp:2
--- rules/base.ml1_s.part.orig 2007-09-29 14:28:06.512621000 +0200
+++ rules/base.ml1_s.part 2007-09-29 14:29:01.956086000 +0200
olpc $olpclayouts = olpc+%l%(m)
olpc * = olpc+%l%(v)
thinkpad br = pc+br(thinkpad)
Index: rules/base.ml1_s.part
===================================================================
--- rules/base.ml1_s.part.orig
+++ rules/base.ml1_s.part
@@ -5,6 +5,6 @@
macintosh_old us = macintosh_vndr/us(oldmac)
macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])

8
xkeyboard-config.mainline-cvs.mac-es.patch
View File

@ -1,8 +1,10 @@
https://bugs.freedesktop.org/show_bug.cgi?id=8683
--- symbols/macintosh_vndr/es.orig 2007-07-12 05:21:17.691899075 +0200
+++ symbols/macintosh_vndr/es 2007-07-12 05:25:17.182286822 +0200
@@ -3,4 +3,19 @@
Index: symbols/macintosh_vndr/es
===================================================================
--- symbols/macintosh_vndr/es.orig
+++ symbols/macintosh_vndr/es
@@ -3,4 +3,19 @@ partial default alphanumeric_keys
xkb_symbols "basic" {
include "es"
name[Group1]= "Spain - Mac";

10
xkeyboard-config.spec
View File

@ -28,7 +28,7 @@ Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us
PreReq: /bin/ln /bin/rm
AutoReqProv: on
Version: 1.5
Release: 1
Release: 2
Summary: The X Keyboard Extension
Source: %name-%version.tar.bz2
Patch4: xkeyboard-config.mainline-cvs.mac-es.patch
@ -110,6 +110,8 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/X11/xkb/
%changelog
* Mon Apr 06 2009 eich@suse.de
- Update patches to apply without fuzz to current package.
* Tue Mar 03 2009 sndirsch@suse.de
- xkeyboard-config 1.5
* More than 40 bugs from freedesktop.org bugzilla were fixed.
@ -161,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT
- fixed keycodes of MS nek4k (bnc #366515)
* Mon Mar 10 2008 sndirsch@suse.de
- more work on support for MS nek4k
* Sat Mar 08 2008 sndirsch@suse.de
* Sun Mar 09 2008 sndirsch@suse.de
- added support for 'Microsoft Natural Ergonomic Keyboard 4000'
(bnc #366515)
* Tue Mar 04 2008 sndirsch@suse.de
@ -238,7 +240,7 @@ rm -rf $RPM_BUILD_ROOT
- update mac/es, add euro to mac/us and mac/dk
* Tue Oct 17 2006 olh@suse.de
- more fixes from cvs, restore previous macintosh behaviour
* Mon Oct 16 2006 olh@suse.de
* Tue Oct 17 2006 olh@suse.de
- fix symbols on macintosh
* Tue Oct 10 2006 sndirsch@suse.de
- updated to release 0.9:
@ -392,7 +394,7 @@ rm -rf $RPM_BUILD_ROOT
* adjusted filelist (.mo files no longer exist, added HOWTO.testing)
* Wed Jul 21 2004 sndirsch@suse.de
- added README.SuSE
* Sat Jun 12 2004 sndirsch@suse.de
* Sun Jun 13 2004 sndirsch@suse.de
- added required hunks of X.Org patches for xkb:
* p_suse.diff
* p_fixes.diff

18
xkeyboard-config.sr@latin.diff
View File

@ -1,7 +1,8 @@
diff -u -r ../xkeyboard-config-1.3.orig//configure ./configure
--- ../xkeyboard-config-1.3.orig//configure 2009-02-09 10:34:06.033713364 +0100
+++ ./configure 2009-02-09 10:36:26.615973356 +0100
@@ -6072,7 +6072,7 @@
Index: configure
===================================================================
--- configure.orig
+++ configure
@@ -6252,7 +6252,7 @@ echo "${ECHO_T}$LINGUAS" >&6; }
< $srcdir/po/POTFILES.in > po/POTFILES
@ -10,10 +11,11 @@ diff -u -r ../xkeyboard-config-1.3.orig//configure ./configure
diff -u -r ../xkeyboard-config-1.3.orig//configure.in ./configure.in
--- ../xkeyboard-config-1.3.orig//configure.in 2009-02-09 10:34:09.669875248 +0100
+++ ./configure.in 2009-02-09 10:35:36.817755760 +0100
@@ -46,7 +46,7 @@
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -46,7 +46,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
AM_GLIB_GNU_GETTEXT