From 6e38f328df8d3028d16f63f93e09739ac0cca296 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Wed, 3 Sep 2003 23:37:58 +0000
Subject: [PATCH] the new patch

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1306 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 .../xfree86/macintosh-xkb-us-de-ibook.patch   | 104 +++++++++---------
 1 file changed, 53 insertions(+), 51 deletions(-)

diff --git a/package/x11/xfree86/macintosh-xkb-us-de-ibook.patch b/package/x11/xfree86/macintosh-xkb-us-de-ibook.patch
index 357dd920d..d0000d992 100644
--- a/package/x11/xfree86/macintosh-xkb-us-de-ibook.patch
+++ b/package/x11/xfree86/macintosh-xkb-us-de-ibook.patch
@@ -25,55 +25,57 @@ iBooks :-(((
 
   Rene Rebe <rene@rocklinux.org>
 
---- xc/programs/xkbcomp/symbols/macintosh/de	2003-06-06 02:32:26.000000000 +0200
-+++ xc/programs/xkbcomp/symbols/macintosh/de	2003-06-08 13:15:36.000000000 +0200
-@@ -89,11 +89,13 @@
-     key <KPDL> {	[  KP_Delete,	KP_Separator	]	};
-     // End "Keypad" section
- 
-+    key <LALT> {        [ Mode_switch,  Multi_key       ]       };
+--- xc/programs/xkbcomp/symbols/macintosh/us_ibook.orig	1970-01-01 01:00:00.000000000 +0100
++++ xc/programs/xkbcomp/symbols/macintosh/us_ibook	2003-09-04 01:15:45.000000000 +0200
+@@ -0,0 +1,23 @@
++// $XConsortium: de /main/4 1996/08/31 12:19:20 kaleb $
++// $XFree86: xc/programs/xkbcomp/symbols/macintosh/de,v 1.1 2000/09/19 12:46:25 eich Exp $
++
++// rene@rocklinux.org - make the iBook useable
++
++default partial alphanumeric_keys 
++xkb_symbols "basic" {
++
++    include "macintosh/us(basic)"
++
++    // Describes the differences between a very simple US/ASCII
++    // keyboard and a very simple iBook keybaord
++
++    // Alphanumeric section
++    name[Group1]= "US/ASCII";
++    key <BKSP> {	[ BackSpace,    BackSpace		],
++			[ Delete				]	};
++    // begin modifier mappings
++    key <LWIN> {	[ Alt_L,	Meta_L	]	};
++    key <RWIN> {	[ Alt_R,	Meta_R	]	};
++
++};
++
+--- xc/programs/xkbcomp/symbols/macintosh/de_ibook.orig	1970-01-01 01:00:00.000000000 +0100
++++ xc/programs/xkbcomp/symbols/macintosh/de_ibook	2003-09-04 01:15:56.000000000 +0200
+@@ -0,0 +1,25 @@
++// $XConsortium: de /main/4 1996/08/31 12:19:20 kaleb $
++// $XFree86: xc/programs/xkbcomp/symbols/macintosh/de,v 1.1 2000/09/19 12:46:25 eich Exp $
++
++// rene@rocklinux.org - make the iBook useable
++
++default partial alphanumeric_keys 
++xkb_symbols "basic" {
++    include "macintosh/de(basic)"
++
++    // Describes the differences between a very simple US/ASCII
++    // keyboard and a very simple iBook keybaord
++
++    // Alphanumeric section
++    name[Group1]= "German";
++    key <BKSP> {	[ BackSpace,    BackSpace		],
++			[ Delete				]	};
++
++    // begin modifier mappings
++    key <LWIN> {	[ Alt_L,	Meta_L	]	};
++    key <RWIN> {	[ Alt_R,	Meta_R	]	};
++
++    key <LALT> {	[ Mode_switch,	Multi_key	]	};
++
++};
 +
-     // begin modifier mappings
- //    modifier_map Shift  { Shift_L };
- //    modifier_map Lock   { Caps_Lock };
- //    modifier_map Control{ Control_L };
--//    modifier_map Mod3	{ Mode_switch };
-+    modifier_map Mod3	{ Mode_switch };
- };
- 
- partial alphanumeric_keys 
---- xc/programs/xkbcomp/symbols/macintosh/us	2003-06-06 02:32:26.000000000 +0200
-+++ xc/programs/xkbcomp/symbols/macintosh/us	2003-06-08 13:19:58.000000000 +0200
-@@ -22,7 +22,7 @@
-     key <AE10> {	[	  0,	parenright	]	};
-     key <AE11> {	[     minus,	underscore	]	};
-     key <AE12> {	[     equal,	plus		]	};
--    key <BKSP> {	[ BackSpace			]	};
-+    key <BKSP> {	[ BackSpace,    KP_Delete	]	};
- 
-     key  <TAB> {	[	Tab,	ISO_Left_Tab	]	};
-     key <AD01> {	[	  q,	Q 		]	};
-@@ -129,10 +129,10 @@
-     key <RTSH> {	[  Shift_R	]	};
-     key <LCTL> {	[  Control_L	]	};
-     key <RCTL> {	[  Control_R	]	};
--    key <LALT> {	[  Alt_L	]	};
--    key <RALT> {	[  Alt_R	]	};
--    key <LWIN> {	[  Meta_L	]	};
--    key <WWIN> {	[  Meta_R	]	};
-+    key <LWIN> {	[  Alt_L,  Meta_L	]	};
-+    key <RWIN> {	[  Alt_R,  Meta_R	]	};
-+#    key <LWIN> {	[  Meta_L	]	};
-+#    key <WWIN> {	[  Meta_R	]	};
-     // End "Modifier" section
- 
-     // begin modifier mappings
-@@ -141,7 +141,7 @@
-     modifier_map Control{ Control_L, Control_R };
-     modifier_map Mod1   { Alt_L, Alt_R };
-     modifier_map Mod2   { Num_Lock };
--    modifier_map Mod4   { Meta_L, Meta_R };
-+#    modifier_map Mod4   { Meta_L, Meta_R };
-     modifier_map Mod5   { Scroll_Lock };
-     // end modifier mappings
-