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

Accepting request 24563 from X11:XOrg

Browse Source 
Copy from X11:XOrg/xkeyboard-config based on submit request 24563 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/24563
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=30
This commit is contained in:
OBS User autobuild 2009-11-18 10:37:21 +00:00 committed by Git OBS Bridge
parent ba4e335b86
commit ce028626f5
11 changed files with 69 additions and 631 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cs.po.diff
View File

@ -1,15 +0,0 @@
Index: po/cs.po
===================================================================
--- po/cs.po.orig
+++ po/cs.po
@@ -2622,10 +2622,6 @@ msgstr "qwerty/číslice"
msgid "qwertz"
msgstr "qwertz"
-#: ../rules/base.xml.in.h:647
-msgid "UCW layout (accented letters only)"
-msgstr "rozložení UCW (pouze akcentovaná písmena)"
-
#: ../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."

76
microsoftnek4k.diff
View File

@ -1,5 +1,3 @@
Index: geometry/microsoft
===================================================================
--- geometry/microsoft.orig --- geometry/microsoft.orig
+++ geometry/microsoft +++ geometry/microsoft
@@ -533,3 +533,43 @@ xkb_geometry "elite" { @@ -533,3 +533,43 @@ xkb_geometry "elite" {
@ -46,8 +44,6 @@ Index: geometry/microsoft
+ { [ 2, 1], [ 24, 1 ], [ 24, 26 ], [ 2, 24 ] } + { [ 2, 1], [ 24, 1 ], [ 24, 26 ], [ 2, 24 ] }
+ }; + };
+}; +};
Index: keycodes/Makefile.am
===================================================================
--- keycodes/Makefile.am.orig --- keycodes/Makefile.am.orig
+++ keycodes/Makefile.am +++ keycodes/Makefile.am
@@ -11,6 +11,7 @@ fujitsu \ @@ -11,6 +11,7 @@ fujitsu \
@ -58,8 +54,6 @@ Index: keycodes/Makefile.am
sony \ sony \
sun \ sun \
xfree86 \ xfree86 \
Index: keycodes/nek4k
===================================================================
--- /dev/null --- /dev/null
+++ keycodes/nek4k +++ keycodes/nek4k
@@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
@ -108,43 +102,6 @@ Index: keycodes/nek4k
+ <SAVE> = 242; + <SAVE> = 242;
+alias <PRNT> = <ONE>; +alias <PRNT> = <ONE>;
+}; +};
Index: rules/base.lists.part
===================================================================
--- rules/base.lists.part.orig
+++ rules/base.lists.part
@@ -52,6 +52,7 @@
logidinovo logidinovoedge \
microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
microsoftoffice microsoftmult \
+ microsoftnek4k \
mx1998 mx2500 mx2750 \
oretec \
presario propeller \
Index: rules/base.m_g.part
===================================================================
--- rules/base.m_g.part.orig
+++ rules/base.m_g.part
@@ -1,5 +1,6 @@
microsoftelite = microsoft(elite)
$msmodels = microsoft(natural)
+ microsoftnek4k = microsoft(nek4k)
dell101 = dell(dell101)
dellm65 = dell(dellm65)
flexpro = keytronic(FlexPro)
Index: rules/base.m_k.part
===================================================================
--- rules/base.m_k.part.orig
+++ rules/base.m_k.part
@@ -7,6 +7,7 @@
abnt2 = xfree86(abnt2)
jp106 = xfree86(jp106)
evdev = evdev
+ microsoftnek4k = evdev+nek4k(nek4k)
olpc = evdev
macintosh_hhk = macintosh(hhk)
macintosh_old = macintosh(old)
Index: rules/base.xml.in
===================================================================
--- rules/base.xml.in.orig --- rules/base.xml.in.orig
+++ rules/base.xml.in +++ rules/base.xml.in
@@ -862,6 +862,13 @@ @@ -862,6 +862,13 @@
@ -161,8 +118,6 @@ Index: rules/base.xml.in
<name>oretec</name> <name>oretec</name>
<_description>Ortek MCK-800 MM/Internet keyboard</_description> <_description>Ortek MCK-800 MM/Internet keyboard</_description>
<vendor>Ortek</vendor> <vendor>Ortek</vendor>
Index: symbols/inet
===================================================================
--- symbols/inet.orig --- symbols/inet.orig
+++ symbols/inet +++ symbols/inet
@@ -1388,6 +1388,42 @@ xkb_symbols "microsoftmult" { @@ -1388,6 +1388,42 @@ xkb_symbols "microsoftmult" {
@ -208,8 +163,6 @@ Index: symbols/inet
// Oretec // Oretec
// Oretec MCK-800 MM/Internet keyboard // Oretec MCK-800 MM/Internet keyboard
Index: keycodes/Makefile.in
===================================================================
--- keycodes/Makefile.in.orig --- keycodes/Makefile.in.orig
+++ keycodes/Makefile.in +++ keycodes/Makefile.in
@@ -210,6 +210,7 @@ fujitsu \ @@ -210,6 +210,7 @@ fujitsu \
@ -220,3 +173,32 @@ Index: keycodes/Makefile.in
sony \ sony \
sun \ sun \
xfree86 \ xfree86 \
--- rules/base.lists.part.orig 2009-11-17 11:24:35.000000000 +0100
+++ rules/base.lists.part 2009-11-17 11:26:07.000000000 +0100
@@ -56,6 +56,7 @@
logidinovo logidinovoedge \
microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
microsoftoffice microsoftmult \
+ microsoftnek4k \
mx1998 mx2500 mx2750 \
oretec \
pc105 \
--- rules/base.m_g.part.orig 2009-08-15 16:31:43.000000000 +0200
+++ rules/base.m_g.part 2009-11-17 11:26:51.000000000 +0100
@@ -1,5 +1,6 @@
microsoftelite = microsoft(elite)
$msmodels = microsoft(natural)
+ microsoftnek4k = microsoft(nek4k)
dell101 = dell(dell101)
dellm65 = dell(dellm65)
latitude = dell(latitude)
--- rules/base.m_k.part.orig 2009-09-21 23:23:32.000000000 +0200
+++ rules/base.m_k.part 2009-11-17 11:27:33.000000000 +0100
@@ -6,6 +6,7 @@
sun6euro = sun(type6tuv_usb)
pc98 = xfree98(pc98)
evdev = evdev
+ microsoftnek4k = evdev+nek4k(nek4k)
olpc = evdev
macintosh_hhk = macintosh(hhk)
macintosh_old = macintosh(old)

19
p_suse.diff
View File

@ -1,14 +1,7 @@
missing description --- symbols/pc.orig 2009-04-29 23:56:05.000000000 +0200
--- +++ symbols/pc 2009-11-17 11:23:25.000000000 +0100
symbols/pc | 5 +++-- @@ -35,9 +35,9 @@ xkb_symbols "pc105" {
1 file changed, 3 insertions(+), 2 deletions(-) modifier_map Mod4 { <LWIN> };
Index: symbols/pc
===================================================================
--- symbols/pc.orig
+++ symbols/pc
@@ -37,9 +37,9 @@ xkb_symbols "pc105" {
key <LWIN> { [ Super_L ] };
key <RTSH> { [ Shift_R ] }; key <RTSH> { [ Shift_R ] };
- key <RCTL> { [ Control_R ] }; - key <RCTL> { [ Control_R ] };
@ -16,10 +9,10 @@ Index: symbols/pc
- key <RWIN> { [ Super_R ] }; - key <RWIN> { [ Super_R ] };
+ key <RWIN> { [ Super_R, Multi_key ] }; + key <RWIN> { [ Super_R, Multi_key ] };
modifier_map Mod4 { <RWIN> };
key <MENU> { [ Menu ] }; key <MENU> { [ Menu ] };
@@ -47,6 +47,7 @@ xkb_symbols "pc105" {
@@ -48,6 +48,7 @@ xkb_symbols "pc105" {
modifier_map Lock { Caps_Lock, ISO_Lock }; modifier_map Lock { Caps_Lock, ISO_Lock };
modifier_map Control{ Control_L, Control_R }; modifier_map Control{ Control_L, Control_R };
modifier_map Mod2 { Num_Lock }; modifier_map Mod2 { Num_Lock };

182
ucw_suse.diff
View File

@ -1,182 +0,0 @@
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"
+
+#: ../rules/base.xml.in.h:647
+msgid "UCW layout (accented letters only)"
+msgstr "rozložení UCW (pouze akcentovaná písmena)"
+
+#: ../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."
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>
+ <variant>
+ <configItem>
+ <name>ucw</name>
+ <_description>UCW layout (accented letters only)</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -4166,6 +4172,12 @@
</option>
<option>
<configItem>
+ <name>grp:caps_switch</name>
+ <description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.</description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
<name>grp:rctrl_switch</name>
<_description>Right Ctrl (while pressed)</_description>
</configItem>
@@ -4605,6 +4617,12 @@
</configItem>
</option>
<option>
+ <configItem>
+ <name>caps:groupshift</name>
+ <description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.</description>
+ </configItem>
+ </option>
+ <option>
<configItem>
<name>caps:shiftlock</name>
<_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)
+cz_ucw cz(ucw)
dev in(deva)
dvorak us(dvorak)
dzdwi bt
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" {
+ key <CAPS> {
+ type[Group1]="PC_ALT_LEVEL2",
+ [ Mode_switch, Caps_Lock ]
+ };
+};
+
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>
+ name[Group1]= "Czechia - ucw";
+
+ key <AD01> { [adiaeresis, Adiaeresis ] };
+ key <AD02> { [ecaron, Ecaron ] };
+ key <AD03> { [eacute, Eacute ] };
+ key <AD04> { [rcaron, Rcaron ] };
+ key <AD05> { [tcaron, Tcaron ] };
+ key <AD06> { [yacute, Yacute ] };
+ key <AD07> { [uring, Uring ] };
+ key <AD08> { [iacute, Iacute ] };
+ key <AD09> { [oacute, Oacute ] };
+ key <AD10> { [odiaeresis, Odiaeresis ] };
+
+ key <AC01> { [aacute, Aacute ] };
+ key <AC02> { [scaron, Scaron ] };
+ key <AC03> { [dcaron, Dcaron ] };
+ key <AC04> { [ediaeresis, Ediaeresis ] };
+ key <AC05> { [racute, Racute ] };
+ key <AC06> { [uacute, Uacute ] };
+ key <AC07> { [udiaeresis, Udiaeresis ] };
+ key <AC08> { [ocircumflex, Ocircumflex ] };
+ key <AC09> { [lcaron, Lcaron ] };
+
+ key <AB01> { [zcaron, Zcaron ] };
+ key <AB02> { [ssharp ] };
+ key <AB03> { [ccaron, Ccaron ] };
+ key <AB04> { [ccedilla, Ccedilla ] };
+ key <AB05> { [ntilde, Ntilde ] };
+ key <AB06> { [ncaron, Ncaron ] };
+ key <AB07> { [lacute, Lacute ] };
+};
+
+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:
+// Caps Lock key temporarily chooses the second keyboard group
+// (until it is released)
+// Alt+Caps Lock toggles caps lock
+partial modifier_keys
+xkb_symbols "caps_switch" {
+ include "capslock(groupshift)"
+};
+
+
// using the group(shift_caps_toggle) map, pressing:
// Shift+Caps Lock toggles group
partial modifier_keys
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)
grp:rwin_switch = +group(rwin_switch)
+ grp:caps_switch = +group(caps_switch)
grp:toggle = +group(toggle)
grp:shifts_toggle = +group(shifts_toggle)
grp:ctrls_toggle = +group(ctrls_toggle)
@@ -52,6 +53,7 @@
caps:swapescape = +capslock(swapescape)
caps:escape = +capslock(escape)
caps:backspace = +capslock(backspace)
+ caps:groupshift = +capslock(groupshift)
ctrl:nocaps = +ctrl(nocaps)
ctrl:swapcaps = +ctrl(swapcaps)
ctrl:ctrl_ac = +ctrl(ctrl_ac)

3
xkeyboard-config-1.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ce15ff22ad6bc0ff7ae735d5ec65dd6dfd736d7eef0cf5ff394f823e663447e4
size 571579

3
xkeyboard-config-1.7.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2597bd5ad1a4b9f1f1a763fbde1fc86629a77476860eb21bd80d36973867e440
size 633314

11
xkeyboard-config.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 17 11:04:20 CET 2009 - sndirsch@suse.de
- xkeyboard-config 1.7
* Around 30 bugs from freedesktop.org bugzilla were fixed.
* Restructured rules-generating scripts.
- obsoletes ucw_suse.diff, xkeyboard-config.sr@latin.diff, cs.po.diff
- adjusted microsoftnek4k.diff, p_suse.diff,
xkeyboard-config.macintosh.patch,
xkeyboard-config.inet.microsoftpro.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 27 22:41:57 CEST 2009 - sndirsch@suse.de Mon Apr 27 22:41:57 CEST 2009 - sndirsch@suse.de

10
xkeyboard-config.inet.microsoftpro.patch
View File

@ -1,10 +1,12 @@
--- rules/base.o_s.part.orig 2009-04-27 17:42:13.000000000 +0200 --- rules/base.o_s.part.orig 2009-08-20 23:19:19.000000000 +0200
+++ rules/base.o_s.part 2009-04-27 17:43:16.000000000 +0200 +++ rules/base.o_s.part 2009-11-17 12:12:12.000000000 +0100
@@ -99,4 +99,7 @@ @@ -103,5 +103,9 @@
shift:breaks_caps = +shift(breaks_caps)
esperanto:qwerty = +epo(qwerty) esperanto:qwerty = +epo(qwerty)
esperanto:dvorak = +epo(dvorak) esperanto:dvorak = +epo(dvorak)
terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp)
+ inet:microsoftpro = +inet(microsoftpro) + inet:microsoftpro = +inet(microsoftpro)
+ inet:media_common = +inet(nav_common) + inet:media_common = +inet(nav_common)
+ inet:nav_common = +inet(nav_common) + inet:nav_common = +inet(nav_common)
+

26
xkeyboard-config.macintosh.patch
View File

@ -3,33 +3,23 @@ handle the left contrl/option/apple keys properly.
apple+tab switches window apple+tab switches window
alt+e gives euro, alt+l gives @, etc alt+e gives euro, alt+l gives @, etc
--- --- rules/base.ml_s.part.orig 2009-09-21 23:23:32.000000000 +0200
rules/base.ml1_s.part | 2 +- +++ rules/base.ml_s.part 2009-11-17 11:17:55.000000000 +0100
rules/base.ml_s.part | 2 +- @@ -21,6 +21,7 @@
2 files changed, 2 insertions(+), 2 deletions(-)
Index: rules/base.ml_s.part
===================================================================
--- rules/base.ml_s.part.orig
+++ rules/base.ml_s.part
@@ -17,7 +17,7 @@
macintosh_old $nonlatin = macintosh_vndr/us(oldmac)+%l%(v):2
macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v) macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v)
$macs en_US = pc+macintosh_vndr/us(extended) $macs en_US = pc+macintosh_vndr/us(extended)
- $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v) $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)
+ $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)+altwin(swap_lalt_lwin)+level3(alt_switch) + $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)+altwin(swap_lalt_lwin)+level3(alt_switch)
olpc $olpclayouts = olpc+%l%(m) olpc $olpclayouts = olpc+%l%(m)
olpc * = olpc+%l%(v) olpc * = olpc+%l%(v)
thinkpad br = pc+br(thinkpad) $thinkpads br = pc+br(thinkpad)
Index: rules/base.ml1_s.part --- rules/base.ml1_s.part.orig 2009-06-09 12:10:01.000000000 +0200
=================================================================== +++ rules/base.ml1_s.part 2009-11-17 11:18:25.000000000 +0100
--- rules/base.ml1_s.part.orig
+++ rules/base.ml1_s.part
@@ -5,6 +5,6 @@ @@ -5,6 +5,6 @@
macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old us = macintosh_vndr/us(oldmac)
macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1])
- $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) - $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])
+ $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])+altwin(swap_lalt_lwin)+level3(alt_switch) + $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])+altwin(swap_lalt_lwin)+level3(alt_switch)
thinkpad br = pc+%l[1](thinkpad) $thinkpads br = pc+%l[1](thinkpad)
* * = pc+%l[1]%(v[1]) * * = pc+%l[1]%(v[1])

325
xkeyboard-config.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package xkeyboard-config (Version 1.5) # spec file for package xkeyboard-config (Version 1.7)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -21,14 +21,14 @@
Name: xkeyboard-config Name: xkeyboard-config
BuildRequires: intltool perl-XML-Parser xorg-x11 BuildRequires: intltool perl-XML-Parser xorg-x11
Url: http://www.freedesktop.org/Software/XKeyboardConfig Url: http://www.freedesktop.org/Software/XKeyboardConfig
License: GPL v2 or later; LGPL v2.1 or later; X11/MIT License: GPL v2 or later ; LGPL v2.1 or later ; MIT License (or similar)
Group: System/X11/Utilities Group: System/X11/Utilities
Requires: xorg-x11 Requires: xorg-x11
Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us
PreReq: /bin/ln /bin/rm PreReq: /bin/ln /bin/rm
AutoReqProv: on AutoReqProv: on
Version: 1.5 Version: 1.7
Release: 4 Release: 1
Summary: The X Keyboard Extension Summary: The X Keyboard Extension
Source: %name-%version.tar.bz2 Source: %name-%version.tar.bz2
Patch4: xkeyboard-config.mainline-cvs.mac-es.patch Patch4: xkeyboard-config.mainline-cvs.mac-es.patch
@ -41,9 +41,6 @@ Patch107: microsoftnek4k-symbols.diff
Patch108: microsoftnek4k-keycodes.diff Patch108: microsoftnek4k-keycodes.diff
Patch109: disable-2xalt_2xctrl-toggle.diff Patch109: disable-2xalt_2xctrl-toggle.diff
Patch110: MDSW-change-keycode.diff Patch110: MDSW-change-keycode.diff
Patch112: ucw_suse.diff
Patch113: xkeyboard-config.sr@latin.diff
Patch114: cs.po.diff
Patch115: xkeyboard-config.inet.microsoftpro.patch Patch115: xkeyboard-config.inet.microsoftpro.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
@ -75,11 +72,7 @@ Authors:
%patch108 %patch108
%patch109 -p1 %patch109 -p1
%patch110 %patch110
%patch112 -p1
%patch113 -p0
%patch114 -p0
%patch115 -p0 %patch115 -p0
mv po/sr@{Latn,latin}.po
%build %build
%configure --with-xkb-rules-symlink=xfree86,xorg \ %configure --with-xkb-rules-symlink=xfree86,xorg \
@ -109,313 +102,3 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/X11/xkb/ /usr/share/X11/xkb/
%changelog %changelog
* Mon Apr 27 2009 sndirsch@suse.de
- removed tp-menu.diff
* Mon Apr 27 2009 sndirsch@suse.de
- xkeyboard-config.inet.microsoftpro.patch (bnc #497647)
* adds microsoftpro internet keyboard keys to any keyboard when
adding the line: Option "XkbOptions" "inet:microsoftpro" to the
keybaord input device section of xorg.conf.
* obsoletes xkeyboard-config.jp.jp106_inet.patch,
xkeyboard-config.br.abnt2_inet.patch
* Sat Apr 25 2009 sndirsch@suse.de
- xkeyboard-config.jp.jp106_inet.patch
* new jp106_inet xkbmodel required for jp layout (bnc #497647)
* Sat Apr 25 2009 sndirsch@suse.de
- xkeyboard-config.br.abnt2_inet.patch
* new abnt2_inet xkbmodel required for br layout (bnc #497647)
* Thu Apr 09 2009 sndirsch@suse.de
- minor cleanup
* 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.
symbols/inet restructured.
- obsoletes xkeyboard-config.powerbook-usb-iso-keyboard.patch,
unknown-keysym.diff
- adjusted MDSW-change-keycode.diff, xkeyboard-config.inet.patch
disable-2xalt_2xctrl-toggle.diff, ucw_suse.diff
- cs.po.diff
* removed dup to fix build
* Mon Feb 09 2009 sndirsch@suse.de
- sr@Latn no longer exists; moved it to sr@latin
* Thu Feb 05 2009 sndirsch@suse.de
- added /usr/share/locale/sr@Latn{,LC_MESSAGES} as directories to
filelist to fix build for factory
* Mon Sep 15 2008 sndirsch@suse.de
- updated ucw_suse.diff
* patching rules/compat/layoutRename.lst instead of
rules/compat/base.l?_s.part (Milan Vancura)
* Mon Sep 15 2008 sndirsch@suse.de
- ucw_suse.diff
* For a long time (~10 years) UCW keyboard layout is used by
many Czech people. It is a trivial configuration change not
affecting anything else (no other dependencies) but a big help
for many Czech programmers. (Milan Vancura)
* Sun Jul 20 2008 sndirsch@suse.de
- xkeyboard-config 1.3
* Around 40 bugs from freedesktop.org bugzilla were fixed. Dropped
old rulesets sgi and sun. Added a lot of metadata, related to
countries and languages.
- obsoletes lv.diff
* Mon Jul 07 2008 sndirsch@suse.de
- reverted previous patch, which was wrong (bnc #405055)
* Wed Jul 02 2008 sndirsch@suse.de
- cz_sk-dropKPDL.diff
* drop KPDL from cz/sk keyboard layout (bnc #405055, bfo #14479)
* Fri May 16 2008 sndirsch@suse.de
- unknown-keysym.diff
* don't map a key to an unknown keysym (bnc #391341)
* Thu May 15 2008 sndirsch@suse.de
- MDSW-change-keycode.diff
* change keycode for virtual <MDSW> key (bnc #389943)
* Tue May 13 2008 sndirsch@suse.de
- disable-2xalt_2xctrl-toggle.diff
* disable Ctrl-Ctrl and Alt-Alt toggle (bnc #373197)
* Fri Apr 04 2008 sndirsch@suse.de
- keyboard layout switching is now also possible as root (bnc #335553)
* Mon Mar 10 2008 sndirsch@suse.de
- fixed keycodes of MS nek4k (bnc #366515)
* Mon Mar 10 2008 sndirsch@suse.de
- more work on support for MS nek4k
* Sun Mar 09 2008 sndirsch@suse.de
- added support for 'Microsoft Natural Ergonomic Keyboard 4000'
(bnc #366515)
* Tue Mar 04 2008 sndirsch@suse.de
- lv.diff
* fixed accented characters in latvian keyboard layout
(bnc #366362, bfo #14756)
* Wed Jan 30 2008 sndirsch@suse.de
- xkeyboard-config 1.2
* Some bugs are fixed (26), new layouts/models as usual. A lot of
code from OLPC is committed.
The important change is the new translation schema. Now,
base.xml does not contain all translations (which made it huge).
Instead, it contains only English strings. The .gmo files are
installed as a part of the installation process. It is up to
the applications/libs (libxklavier) to invoke gettext functions
at runtime - using the "xkeyboard-config" domain.
* Sat Sep 29 2007 sndirsch@suse.de
- xkeyboard-config 1.1
* some bug fixes (27)
* new layouts/models
* Sat Aug 25 2007 sndirsch@suse.de
- reverted tp-menu.diff (wrong approach, Bug #302099)
* Thu Jul 12 2007 sndirsch@suse.de
- xkeyboard-config 1.0
* It is about 9 months since 0.9 - and here goes 1.0. There is
nothing special big and special about that release, it is
rather "0.9 + 0.1" than "1.0" release. Around 70 bugs from
freedesktop.org bugzilla were fixed. The largest user-visible
change is elimination of the word "group" in base.xml - it is
replaced with "layout". This makes UIs using those strings
easier to perceive.
- removed obsolete patches
* xkeyboard-config.mainline-cvs.group.patch
* xkeyboard-config.mainline-cvs.il.patch
* xkeyboard-config.mainline-cvs.it.patch
* xkeyboard-config.mainline-cvs.level3.patch
* xkeyboard-config.mainline-cvs.mac-euro.patch
* xkeyboard-config.mainline-cvs.mac-us.patch
* xkeyboard-config.mainline-cvs.trans.patch
* xkeyboard-config.mainline-cvs.us-backslash.patch
- adjusted patches
* p_suse.diff
* xkeyboard-config.inet.patch
* xkeyboard-config.macintosh.patch
* xkeyboard-config.mainline-cvs.mac-es.patch
* Tue May 22 2007 sndirsch@suse.de
- tp-menu.diff:
* add mapping for Menu key on new Thinkpads like T60 (Bug #253397)
* Mon May 21 2007 sndirsch@suse.de
- xkeyboard-config.mainline-cvs.us-backslash.patch:
* backslash needs to be explicitely set in us (Bug #275561)
* Sun May 13 2007 sndirsch@suse.de
- xkeyboard-config.mainline-cvs.il.patch:
* fixed mapping for "|" symbol in hebrew layout (Bug #273712)
* Sat Apr 28 2007 schwab@suse.de
- Fix unknown keysym in inet(cymotionlinux).
- Fix keycode for KP_Equal in inet(apple).
* Sun Apr 08 2007 schwab@suse.de
- Regenerate *.dir files.
- Reduce build requirements.
* Sat Feb 03 2007 sndirsch@suse.de
- removed braindead cz-basic-bksl.diff again (Bugs #215359/#241824);
use variant bksl/qwerty_bksl for cz keyboard layout instead
* Wed Nov 15 2006 sndirsch@suse.de
- xkeyboard-config.mainline-cvs.trans.patch:
* updated Hungarian translations (Bug #8996)
* Fri Oct 27 2006 olh@suse.de
- disable apple:badmap/apple:goodmap for Powerbooks with built-in
USB ISO keyboard. The kernel delivers the correct keys now
* Fri Oct 27 2006 sndirsch@suse.de
- cz-basic-bksl.diff:
* fixes backslash/bar on czech keyboard (Bug #215359)
* Tue Oct 17 2006 olh@suse.de
- 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
* Tue Oct 17 2006 olh@suse.de
- fix symbols on macintosh
* Tue Oct 10 2006 sndirsch@suse.de
- updated to release 0.9:
* Around 80 bugs from freedesktop.org bugzilla are fixed.
* New layouts/models/translations are introduced.
* Macintosh layouts are heavily redesigned (big thangs to Denis
Barbier).
- adjusted ibm_space_saver.diff, p_suse.diff
- obsoletes ISO_Level5.diff, c300.diff, logitech.diff, ralt.diff,
xkeyboard-config_korean.diff
- disabled p_macintosh-kb.diff since it no longer applies due to
radical changes for Macintosh layout (see above); hopefully it's
no longer required ...
* Tue Aug 01 2006 sndirsch@suse.de
- added xorg-x11 to Requires/BuildRequires to fix build
- cleanup
* Fri Jul 28 2006 sndirsch@suse.de
- use "-fno-strict-aliasing"
* Thu Jul 27 2006 sndirsch@suse.de
- added support for inet keys on Acer C300 Laptop (dsieben)
(fd.o Bug #7651)
* Tue Jul 25 2006 sndirsch@suse.de
- adjusted for X.Org 7
* Sat Jun 24 2006 sndirsch@suse.de
- logitech.diff:
* removed double entry for XF86AudioRaiseVolume (Bug #181118)
* Wed Jun 14 2006 sndirsch@suse.de
- use explicit hexadecimal values instead of XK_ISO_Level5 defines;
makes changes in X.Org unnecessary (Bug #158951, X.Org Bug #4411)
* Sat Jun 10 2006 sndirsch@suse.de
- ISO_Level5.diff:
* obsoletes ca_multi.diff (Bug #158951, X.Org Bug #4411)
* Fri Jun 09 2006 sndirsch@suse.de
- ca_multi.diff:
* added support for "Canada - Multilingual" keyboard (Bug #158951)
* Sat Apr 15 2006 sndirsch@suse.de
- updated to release 0.8
* obsoletes khmer.diff, numlock-scrollLock.diff
* Sat Mar 25 2006 sndirsch@suse.de
- ralt.diff:
* addresses RAlt problems (Bug #158177, Ubuntu #35845)
* Mon Mar 20 2006 sndirsch@suse.de
- xkeyboard-config_korean.diff:
* korean keyboard layout (Bug #87443, freedesktop Bug #6323)
* Mon Feb 13 2006 sndirsch@suse.de
- added missing xorg rules symlinks (Bug #150245)
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Sun Jan 22 2006 sndirsch@suse.de
- numlock-scrollLock.diff:
* fix for Numlock/ScrollLock problem (X.Org Bug #5635)
* Mon Jan 16 2006 sndirsch@suse.de
- khmer.diff:
* adds khmer keyboard support (Bug #143348)
* Wed Jan 04 2006 sndirsch@suse.de
- added xorg.lst compatibility symlink (required by xorgcfg)
* Fri Dec 23 2005 sndirsch@suse.de
- updated to new version 0.7
* Mon Dec 05 2005 sndirsch@suse.de
- updated to current CVS release (2005-12-05)
* Thu Dec 01 2005 sndirsch@suse.de
- updated to current CVS release (2005-12-01)
* obsoletes br-abnt2.diff
* fixes Dell Inspiron 6000 layout for special keys (#135764)
* obsoletes patches for symbols/macintosh_vndr/fr (X.Org #2870)
* Tue Sep 20 2005 sndirsch@suse.de
- br-abnt2.diff:
* fixed brazilian "abnt2" keyboard layout (#116425)
* Tue Sep 06 2005 sndirsch@suse.de
- removed Prereq to xorg-x11 (#115369)
* Thu Aug 25 2005 sndirsch@suse.de
- updated to new version 0.6
* move Macedonian to country-based
* translation updates
* Wed Aug 24 2005 sndirsch@suse.de
- updated to current CVS release (2005-08-24)
* fr-latin9 compatibility rule added
* added Thaana Keyboard Map
* "Major Balkanian revolution" (Danilo Segan)
* updated russian and turkish translations
* Sat Aug 20 2005 sndirsch@suse.de
- updated to current CVS release (2005-08-20)
* updated Iranian layout to new standard (fd.o Bug #4102)
* updated translations for tr
* Wed Aug 17 2005 sndirsch@suse.de
- ibm_space_saver.diff:
* add support for "ibm_space_saver" keyboards (Bug #59788)
* Sun Aug 14 2005 sndirsch@suse.de
- updated to current CVS release (2005-08-14)
* obsoletes print-screen.diff
* buildfix for update-pot/update-po in po/Makefile.am
* Thu Aug 11 2005 sndirsch@suse.de
- print-screen.diff:
* fixes GNOME print-screen functionality (Bug #103990)
* Wed Aug 10 2005 sndirsch@suse.de
- updated to current CVS release (2005-08-10)
* Tue Aug 02 2005 schwab@suse.de
- Fix reference to eject key in macintosh keymap.
- Make noarch.
* Fri Jul 29 2005 sndirsch@suse.de
- xkeyboard-config-0.5.diff:
* fixes typo: options --> option (Bug #98980)
- enabled use of xkeyboard-config again
* Thu Jul 28 2005 sndirsch@suse.de
- make xkeyboard-config optional again; currently to big problems
(Bug #98980)
* Tue Jul 26 2005 sndirsch@suse.de
- finally remove /etc/X11/xkb/symbols/pc directory of xorg-x11
package (%%pre)
* Thu Jul 14 2005 sndirsch@suse.de
- added /etc/X11/xkb/xkbcomp to package instead of
creating/removing the symlink in %%post/%%preun
* Mon Jul 11 2005 sndirsch@suse.de
- add "Prereq: xorg-x11" to make sure that /etc/X11/xkb/symbols/pc/
directory will be removed before xkeyboard-config installs
/etc/X11/xkb/symbols/pc file (Bug #95914).
* Wed Jul 06 2005 sndirsch@suse.de
- add symlink /usr/X11R6/lib/X11/xkb --> /etc/X11/xkb
* Wed Jul 06 2005 sndirsch@suse.de
- install package during update when xorg-x11/XFree86 package was
already installed
* Wed Jul 06 2005 sndirsch@suse.de
- use /etc/X11/xkb for data files now; replaces the data files of
xorg-x11 package
* Fri May 13 2005 sndirsch@suse.de
- use norootforbuild
* Sun Apr 17 2005 sndirsch@suse.de
- enabled compatibity rules (compatibility on 'XkbLayout' level)
* Sun Feb 06 2005 sndirsch@suse.de
- updated to release 0.5:
* More bugs from freedesktop.org bugzilla fixed.
The group names now are matching the descriptions - and the
validating scripts are implemented.
Some layouts, variants, models are added/fixed.
Some translations are updated (though the overall translation
activity is disappointinly low).
* obsoletes p_xkb-cherryblueb.diff
* Sun Oct 24 2004 sndirsch@suse.de
- updated patches
- removed obsolete patches
* Sun Oct 03 2004 sndirsch@suse.de
- updated to release 0.4:
* A lot of fixes. More univeral EURO handling. New urdu layout.
Improved handling for indicators.
* Wed Sep 29 2004 sndirsch@suse.de
- added missing prerequires ln,rm (Bug #46480)
* Sat Jul 24 2004 sndirsch@suse.de
- updated to release 0.3
* adjusted patches p_XFree86-4.3-kbdmapping.diff,
p_xkb-cherryblueb.diff
* adjusted filelist (.mo files no longer exist, added HOWTO.testing)
* Wed Jul 21 2004 sndirsch@suse.de
- added README.SuSE
* Sun Jun 13 2004 sndirsch@suse.de
- added required hunks of X.Org patches for xkb:
* p_suse.diff
* p_fixes.diff
* p_xkb-cherryblueb.diff
* p_XFree86-4.3-kbdmapping.diff
* p_macintosh-kb.diff
* Sat Jun 12 2004 sndirsch@suse.de
- created package

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

@ -1,26 +0,0 @@
Index: configure
===================================================================
--- configure.orig
+++ configure
@@ -6252,7 +6252,7 @@ echo "${ECHO_T}$LINGUAS" >&6; }
< $srcdir/po/POTFILES.in > po/POTFILES
-ALL_LINGUAS="af az bg cs da el en_GB es fi fr hu it ka ko nl ru rw sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="af az bg cs da el en_GB es fi fr hu it ka ko nl ru rw sk sl sq sr sr@latin sv tr uk vi zh_CN zh_TW"
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -46,7 +46,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
AM_GLIB_GNU_GETTEXT
-ALL_LINGUAS="af az bg cs da el en_GB es fi fr hu it ka ko nl ru rw sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="af az bg cs da el en_GB es fi fr hu it ka ko nl ru rw sk sl sq sr sr@latin sv tr uk vi zh_CN zh_TW"
AC_SUBST(xkb_base)
AC_SUBST(xkb_rules_symlink)