Hello community,
here is the log from the commit of package xkeyboard-config
checked in at Tue Oct 17 00:09:25 CEST 2006.
--------
--- xkeyboard-config/xkeyboard-config.changes 2006-10-10 11:07:03.000000000 +0200
+++ /mounts/work_src_done/NOARCH/xkeyboard-config/xkeyboard-config.changes 2006-10-17 00:09:02.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Oct 17 00:08:50 CEST 2006 - olh@suse.de
+
+- fix symbols on macintosh
+
+-------------------------------------------------------------------
New:
----
xkeyboard-config.macintosh.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xkeyboard-config.spec ++++++
--- /var/tmp/diff_new_pack.aSKmDO/_old 2006-10-17 00:09:17.000000000 +0200
+++ /var/tmp/diff_new_pack.aSKmDO/_new 2006-10-17 00:09:17.000000000 +0200
@@ -20,11 +20,12 @@
PreReq: /bin/ln /bin/rm
Autoreqprov: on
Version: 0.9
-Release: 1
+Release: 5
Summary: The X Keyboard Extension
Source: %name-%version.tar.bz2
Patch: p_suse.diff
Patch1: ibm_space_saver.diff
+Patch2: xkeyboard-config.macintosh.patch
Patch4: p_macintosh-kb.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -48,6 +49,7 @@
%setup
%patch
%patch1
+%patch2 -p1
### No longer applies due to heavily redesigned Macintosh layouts in 0.9
#%patch4 -p2
@@ -76,6 +78,8 @@
/usr/share/X11/xkb/
%changelog -n xkeyboard-config
+* 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.
++++++ ibm_space_saver.diff ++++++
--- /var/tmp/diff_new_pack.aSKmDO/_old 2006-10-17 00:09:17.000000000 +0200
+++ /var/tmp/diff_new_pack.aSKmDO/_new 2006-10-17 00:09:17.000000000 +0200
@@ -1,6 +1,14 @@
-diff -u -r ../xkeyboard-config-0.9.old/rules/base.lists.part ./rules/base.lists.part
---- ../xkeyboard-config-0.9.old/rules/base.lists.part 2006-10-10 10:29:10.000000000 +0200
-+++ ./rules/base.lists.part 2006-10-10 10:29:23.000000000 +0200
+---
+ rules/base.lists.part | 2 ++
+ rules/base.m_s.part | 1 +
+ rules/base.xml.in | 6 ++++++
+ symbols/group | 5 +++++
+ 4 files changed, 14 insertions(+)
+
+Index: rules/base.lists.part
+===================================================================
+--- rules/base.lists.part.orig
++++ rules/base.lists.part
@@ -56,6 +56,8 @@
toshiba_s3000 trust trustda \
yahoo
@@ -10,17 +18,19 @@
// all layouts with 3rd and 4th groups
! $threelevellayouts = al az \
be br bt \
-diff -u -r ../xkeyboard-config-0.9.old/rules/base.m_s.part ./rules/base.m_s.part
---- ../xkeyboard-config-0.9.old/rules/base.m_s.part 2006-10-10 10:29:10.000000000 +0200
-+++ ./rules/base.m_s.part 2006-10-10 10:29:23.000000000 +0200
+Index: rules/base.m_s.part
+===================================================================
+--- rules/base.m_s.part.orig
++++ rules/base.m_s.part
@@ -1,3 +1,4 @@
$inetkbds = +inet(%m)
+ $specialkbds = +group(%m)
$maclaptop = +inet(apple)+level3(enter_switch)
$macs = +inet(apple)
-diff -u -r ../xkeyboard-config-0.9.old/rules/base.xml.in ./rules/base.xml.in
---- ../xkeyboard-config-0.9.old/rules/base.xml.in 2006-10-10 10:29:10.000000000 +0200
-+++ ./rules/base.xml.in 2006-10-10 10:29:23.000000000 +0200
+Index: rules/base.xml.in
+===================================================================
+--- rules/base.xml.in.orig
++++ rules/base.xml.in
@@ -706,6 +706,12 @@
</model>
<model>
@@ -34,15 +44,16 @@
<name>macintosh</name>
<_description>Macintosh
</configItem>
-diff -u -r ../xkeyboard-config-0.9.old/symbols/group ./symbols/group
---- ../xkeyboard-config-0.9.old/symbols/group 2006-10-10 10:29:10.000000000 +0200
-+++ ./symbols/group 2006-10-10 10:30:46.000000000 +0200
-@@ -305,3 +305,8 @@
+Index: symbols/group
+===================================================================
+--- symbols/group.orig
++++ symbols/group
+@@ -305,3 +305,8 @@ xkb_symbols "alt_caps_toggle" {
};
};
+// Override broken Numlock key on some IBM keyboards
-+partial
-+xkb_symbols "ibm_space_saver" {
-+ key <NMLK> { [ Num_Lock, Num_Lock ] };
++partial
++xkb_symbols "ibm_space_saver" {
++ key <NMLK> { [ Num_Lock, Num_Lock ] };
+};
++++++ p_suse.diff ++++++
--- /var/tmp/diff_new_pack.aSKmDO/_old 2006-10-17 00:09:17.000000000 +0200
+++ /var/tmp/diff_new_pack.aSKmDO/_new 2006-10-17 00:09:17.000000000 +0200
@@ -1,6 +1,12 @@
---- symbols/pc.orig 2006-09-18 13:45:12.000000000 +0200
-+++ symbols/pc 2006-10-10 10:27:21.000000000 +0200
-@@ -37,9 +37,9 @@
+---
+ symbols/pc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+Index: symbols/pc
+===================================================================
+--- symbols/pc.orig
++++ symbols/pc
+@@ -37,9 +37,9 @@ xkb_symbols "pc105" {
key <LWIN> { [ Super_L ] };
key <RTSH> { [ Shift_R ] };
@@ -12,7 +18,7 @@
key <MENU> { [ Menu ] };
-@@ -48,6 +48,7 @@
+@@ -48,6 +48,7 @@ xkb_symbols "pc105" {
modifier_map Lock { Caps_Lock, ISO_Lock };
modifier_map Control{ Control_L, Control_R };
modifier_map Mod2 { Num_Lock };
++++++ xkeyboard-config.macintosh.patch ++++++
parts are argued in https://bugs.freedesktop.org/show_bug.cgi?id=8660
---
symbols/macintosh_vndr/de | 2 +-
symbols/macintosh_vndr/dk | 2 +-
symbols/macintosh_vndr/es | 16 ++++++++++++++--
symbols/macintosh_vndr/us | 8 ++++++--
4 files changed, 22 insertions(+), 6 deletions(-)
Index: xkeyboard-config-0.9/symbols/macintosh_vndr/dk
===================================================================
--- xkeyboard-config-0.9.orig/symbols/macintosh_vndr/dk
+++ xkeyboard-config-0.9/symbols/macintosh_vndr/dk
@@ -29,7 +29,7 @@ xkb_symbols "basic" {
key <AB10> { [ minus, underscore, hyphen, macron ]};
key <AC01> { [ a, A, ordfeminine, masculine ]};
key <AC03> { [ d, D, eth, ETH ]};
- key <AD03> { [ e, E, NoSymbol, cent ]};
+ key <AD03> { [ e, E, EuroSign, cent ]};
key <AD04> { [ r, R, registered, NoSymbol ]};
key <AD05> { [ t, T, thorn, THORN ]};
key <AD08> { [ i, I, NoSymbol, NoSymbol ]};
Index: xkeyboard-config-0.9/symbols/macintosh_vndr/es
===================================================================
--- xkeyboard-config-0.9.orig/symbols/macintosh_vndr/es
+++ xkeyboard-config-0.9/symbols/macintosh_vndr/es
@@ -10,8 +10,8 @@ xkb_symbols "basic" {
key <TLDE> { [ bracketleft, bracketright, braceleft, braceright ] };
key <LSGT> { [ less, greater, bracketleft, braceleft ] };
- key <AE01> { [ 1, exclam ] };
- key <AE02> { [ 2, exclamdown, at, oneeighth ] };
+ key <AE01> { [ 1, exclamdown ] };
+ key <AE02> { [ 2, exclam, at, oneeighth ] };
key <AE03> { [ 3, numbersign, guillemotleft, guillemotright ] };
key <AE04> { [ 4, dollar, yen, Icircumflex ] };
key <AE05> { [ 5, percent ] };
@@ -36,3 +36,15 @@ xkb_symbols "basic" {
include "level3(ralt_switch)"
};
+
+xkb_symbols "nodeadkeys" {
+ // a dummy map to workaround XF86config errors
+ include "macintosh/es(basic)"
+};
+
+xkb_symbols "iso" {
+ // the people in spain use PC style keyboards on their macs
+ // credits to Xoán Pedracova
participants (1)
-
root@suse.de