From da79847ed2ce5d99b77c6e93313ab981a37b52aa Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 27 Nov 2007 12:01:20 +0000
Subject: - use xkb instead of xmodmap   (this fixes XF86_Switch_VT_X not
 defined in our xmodmaps)

=> stage2 is bigger: 640KB uncompressed, 223KB compressed
---
 perl-install/install/NEWS                    |   2 ++
 perl-install/install/gtk.pm                  |   5 ++---
 perl-install/install/share/aliases           |   1 +
 perl-install/install/share/keyboards.tar.bz2 | Bin 31960 -> 0 bytes
 perl-install/install/share/list.xml          |  20 ++++++++++++++++++--
 perl-install/install/steps_gtk.pm            |   2 +-
 6 files changed, 24 insertions(+), 6 deletions(-)
 delete mode 100644 perl-install/install/share/keyboards.tar.bz2

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 02ee14218..ecd57e6cb 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- use xkb instead of xmodmap 
+  (this fixes XF86_Switch_VT_X not defined in our xmodmaps)
 - save bootloader on MBR when calling grub/install.sh, and restore it before
   calling it again (#35255) (ie implement "lilo -u" for grub)
 - ensure /etc/sysconfig/console/default.kmap is generated with installed
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm
index 37a95fa69..ba47a901b 100644
--- a/perl-install/install/gtk.pm
+++ b/perl-install/install/gtk.pm
@@ -245,7 +245,7 @@ sub createXconf {
     symlink("/tmp/stage2/etc/X11", "/etc/X11");
 
 if ($Driver) {
-     output($file, sprintf(<<'END', 'Option "XkbDisable"', $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"'));
+     output($file, sprintf(<<'END', $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"'));
 Section "Files"
    FontPath   "/usr/share/fonts:unscaled"
 EndSection
@@ -253,9 +253,8 @@ EndSection
 Section "InputDevice"
     Identifier "Keyboard"
     Driver "keyboard"
-    %s
     Option "XkbModel" "pc105"
-    Option "XkbLayout" ""
+    Option "XkbLayout" "us"
 EndSection
 
 Section "InputDevice"
diff --git a/perl-install/install/share/aliases b/perl-install/install/share/aliases
index 9e62eb124..792566cd9 100644
--- a/perl-install/install/share/aliases
+++ b/perl-install/install/share/aliases
@@ -4,3 +4,4 @@
 /usr/bin/runinstall2 install2
 /sbin/fsck.ext2 e2fsck
 /lib/modules /modules
+/usr/share/X11/xkb/compiled /tmp
diff --git a/perl-install/install/share/keyboards.tar.bz2 b/perl-install/install/share/keyboards.tar.bz2
deleted file mode 100644
index c9765dc60..000000000
Binary files a/perl-install/install/share/keyboards.tar.bz2 and /dev/null differ
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index 1d0504003..548a02626 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -36,7 +36,9 @@
   quotacheck
 
   setfont kbd_mode
-  Xorg xmodmap xset
+  Xorg xset
+  xkbcomp setxkbmap
+
   fb2png
   perl
   monitor-edid monitor-get-edid-using-vbe monitor-parse-edid monitor-get-edid
@@ -73,6 +75,20 @@
   libshadow.so
 </from>
 
+<from dir="/usr/share/X11/xkb">
+ <filter subst="s!//.*!!; $_ = '' if $ARGV =~ /inet$/">
+  geometry/pc
+  keycodes/aliases
+  keycodes/xfree86
+  rules/xorg
+  rules/xorg.lst
+  compat semantics types
+  <from expand="glob">
+    symbols/*
+  </from>
+ </filter>
+</from>
+
 <from dir="/usr/share/fonts/">
   <to flatten="on">
     misc/cursor.pcf.gz
@@ -120,6 +136,7 @@
   /etc/rpm/macros.cdb
   /LIB/udev/usb_id
   /usr/LIB/xserver/SecurityPolicy
+  /usr/share/X11/XKeysymDB
   /etc/pango/ARCH/pango.modules
   /usr/LIB/gtk-2.0/*/loaders/libpixbufloader-png.so
   <!-- XPM loader is needed by Gtk2::Html2 on error -->
@@ -382,7 +399,6 @@
 <from dir="share">
   <from expand="tar">
     fonts.tar.bz2
-    keyboards.tar.bz2
     keymaps.tar.bz2
   </from>
 
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 58c215f8b..fd68ee955 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -50,7 +50,7 @@ sub new($$) {
 	    } else {
 		install::gtk::createXconf($f, @{$o->{mouse}}{'Protocol', 'device'}, $o->{mouse}{wacom}[0], $Driver);
 
-		push @options, '-kb', '-allowMouseOpenFail', '-xf86config', $f if arch() !~ /^sparc/;
+		push @options, '-allowMouseOpenFail', '-xf86config', $f if arch() !~ /^sparc/;
 		push @options, 'tty7', '-s', '240';
 
 		#- old weird servers: Xsun
-- 
cgit v1.2.1