Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ec10b3f0a81bdb8bd2b49acc83608d5330dbb9e0
commit ec10b3f0a81bdb8bd2b49acc83608d5330dbb9e0
Author: bouleetbil <bouleet...@frogdev.info>
Date: Mon Jul 26 23:19:32 2010 +0200
xorg-server-1.8.2-5-x86_64
*fixed post install with xkb variant
*added nodeadkeys
*added Ctrl + Alt + Backspace option
*see later for ati and nvidia
*here fonts works /etc/fonts/fonts.conf is good
*tested with frozen-bubble
diff --git a/source/x11/xorg-server/10-evdev.conf
b/source/x11/xorg-server/10-evdev.conf
index 88e10af..5d4a3a7 100644
--- a/source/x11/xorg-server/10-evdev.conf
+++ b/source/x11/xorg-server/10-evdev.conf
@@ -4,5 +4,7 @@ Section "InputClass"
MatchDevicePath "/dev/input/event*"
Driver "evdev"
Option "xkb_layout" "Keyboard_Layout"
+ Option "XkbVariant" "nodeadkeys"
+ Option "XkbOptions" "terminate:ctrl_alt_bksp"
EndSection
diff --git a/source/x11/xorg-server/FrugalBuild
b/source/x11/xorg-server/FrugalBuild
index 0123e5b..2333022 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -10,7 +10,7 @@ USE_MULTIBUFFER=${USE_MULTIBUFFER:-"n"}
pkgname=xorg-server
pkgver=1.8.2
-pkgrel=4
+pkgrel=5
pkgdesc="Modular X.Org X Server"
groups=('x11' 'xorg-core')
archs=('i686' 'x86_64' 'ppc')
@@ -40,7 +40,7 @@ source=(${sour...@]} \
sha1sums=('825d11757b729444800e0a3afd4e98d19d286b1a' \
'676c8ad10a362615ae54de825e37c18c1f69ae08' \
- '75f196f82ae19a335b83971b6fbb0f49a9bf6a58' \
+ 'c4e12a980aa29e1feef01e9d33e044ed773fd29e' \
'6c0156d129ddd2fb5277b76af1738298c2d09d4d')
if Fuse $USE_DEVEL; then
diff --git a/source/x11/xorg-server/xorg-server.install
b/source/x11/xorg-server/xorg-server.install
index 59a979f..7e118de 100644
--- a/source/x11/xorg-server/xorg-server.install
+++ b/source/x11/xorg-server/xorg-server.install
@@ -1,7 +1,7 @@
post_install()
{
# setting the layout from the tty console layout created by the installer
- layout=`cat /etc/sysconfig/keymap | awk -F'=' '/keymap=/ {print $2}' |
sed 's/^\(.*\)-.*/\1/'`
+ layout=`awk -F'=' '/keymap=/ {print $2}' /etc/sysconfig/keymap | sed
's|-.*||g'`
echo "Update layout keyboard with $layout"
sed -i "/xkb_layout/s/Keyboard_Layout/$layout/"
/etc/X11/xorg.conf.d/10-evdev.conf
}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
