Chakra_Linux/core
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/core.git synced 2025-01-24 18:42:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chakra-initscripts: fix xorg18 keyboard-setup

Browse Source
This commit is contained in:
amnon 2010-10-08 16:53:30 +00:00
parent 83b4d34566
commit 9fa4832dc2
4 changed files with 85 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chakra-initscripts/PKGBUILD
View File

@ -10,7 +10,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
_origname=initscripts
pkgname=chakra-initscripts
pkgver=2010.07
pkgrel=2
pkgrel=3
pkgdesc="System initialization/bootup scripts"
arch=(i686 x86_64)
url="http://www.chakra-project.org"

120
chakra-initscripts/etc/rc.sysinit
View File

@ -366,8 +366,8 @@ COUNTRY=`get_country`
KEYMAP="es"
XKEYMAP="es"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"es"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"es"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
be)
# Belarusian
@ -377,8 +377,8 @@ COUNTRY=`get_country`
KEYMAP="be"
XKEYMAP="be"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"be"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"be"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
bg)
# Bulgarian
@ -388,8 +388,8 @@ COUNTRY=`get_country`
KEYMAP="bg"
XKEYMAP="bg"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"bg"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"bg"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
ca)
# Catalan
@ -399,8 +399,8 @@ COUNTRY=`get_country`
KEYMAP="es"
XKEYMAP="es"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"es"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"es"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
cs)
# Czech
@ -410,8 +410,8 @@ COUNTRY=`get_country`
KEYMAP="cz-lat2"
XKEYMAP="cz"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"cz"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"cz"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
de)
# German
@ -421,8 +421,8 @@ COUNTRY=`get_country`
KEYMAP="de"
XKEYMAP="de"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"de"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"de"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
dk)
# Danish
@ -432,8 +432,8 @@ COUNTRY=`get_country`
KEYMAP="dk"
XKEYMAP="dk"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"dk"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"dk"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
engb)
# British
@ -443,8 +443,8 @@ COUNTRY=`get_country`
KEYMAP="us"
XKEYMAP="us"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"us"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"us"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
enus)
# English
@ -454,8 +454,8 @@ COUNTRY=`get_country`
KEYMAP="us"
XKEYMAP="us"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"us"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"us"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
es)
# Spain
@ -465,8 +465,8 @@ COUNTRY=`get_country`
KEYMAP="es"
XKEYMAP="es"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"es"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"es"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
eu)
# Basque
@ -476,8 +476,8 @@ COUNTRY=`get_country`
KEYMAP="es"
XKEYMAP="es"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"es"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"es"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
fi)
# Finland
@ -487,8 +487,8 @@ COUNTRY=`get_country`
KEYMAP="fi"
XKEYMAP="fi"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"fi"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"fi"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
fr)
# France
@ -498,8 +498,8 @@ COUNTRY=`get_country`
KEYMAP="fr"
XKEYMAP="fr"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"fr"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"fr"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
gl)
# Galician
@ -509,8 +509,8 @@ COUNTRY=`get_country`
KEYMAP="es"
XKEYMAP="es"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"es"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"es"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
hu)
# Hungary
@ -520,8 +520,8 @@ COUNTRY=`get_country`
KEYMAP="hu"
XKEYMAP="hu"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"hu"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"hu"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
hr)
# Croatian
@ -531,8 +531,8 @@ COUNTRY=`get_country`
KEYMAP="hr"
XKEYMAP="hr"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"hr"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"hr"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
it)
# Italy
@ -542,8 +542,8 @@ COUNTRY=`get_country`
KEYMAP="it"
XKEYMAP="it"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"it"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"it"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
ja)
# Japanese
@ -553,8 +553,8 @@ COUNTRY=`get_country`
KEYMAP="us"
XKEYMAP="us"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"us"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"us"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
nl)
# Dutch
@ -564,8 +564,8 @@ COUNTRY=`get_country`
KEYMAP="us"
XKEYMAP="us"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"us"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"us"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
no)
# Norway
@ -575,8 +575,8 @@ COUNTRY=`get_country`
KEYMAP="no"
XKEYMAP="no"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"no"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"no"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
pl)
# Poland
@ -586,8 +586,8 @@ COUNTRY=`get_country`
KEYMAP="pl"
XKEYMAP="pl"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"pl"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"pl"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
ptbr)
# Poland
@ -597,8 +597,8 @@ COUNTRY=`get_country`
KEYMAP="br-abnt2"
XKEYMAP="pt"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"pt"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"pt"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
ru)
# Russia
@ -608,8 +608,8 @@ COUNTRY=`get_country`
KEYMAP="ru"
XKEYMAP="ru"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"ru"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"ru"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
sk)
# Slovak
@ -619,8 +619,8 @@ COUNTRY=`get_country`
KEYMAP="sk"
XKEYMAP="sk"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"sk"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"sk"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
sl)
# Slovenian
@ -630,8 +630,8 @@ COUNTRY=`get_country`
KEYMAP="slovene"
XKEYMAP="si"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"si"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"si"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
sr)
# Serbian
@ -641,8 +641,8 @@ COUNTRY=`get_country`
KEYMAP="sr"
XKEYMAP="sr"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"sr"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"sr"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
tr)
# Turkish
@ -652,8 +652,8 @@ COUNTRY=`get_country`
KEYMAP="tr"
XKEYMAP="trq"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"tr"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"tr"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
vcia)
# Catalan (valencia)
@ -663,8 +663,8 @@ COUNTRY=`get_country`
KEYMAP="es"
XKEYMAP="es"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"es"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"es"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
zhcn)
# Simplified Chinese
@ -674,8 +674,8 @@ COUNTRY=`get_country`
KEYMAP="us"
XKEYMAP="us"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"us"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"us"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
*)
# American
@ -685,8 +685,8 @@ COUNTRY=`get_country`
KEYMAP="us"
XKEYMAP="us"
# add HAL config for Xorg input stuff
cp -f /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi /etc/hal/fdi/policy/10-keymap.fdi
sed -i "/input.xkb.layout/ s/us/"us"/" /etc/hal/fdi/policy/10-keymap.fdi
cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf
sed -i "/XkbLayout/ s/us/"us"/" /etc/X11/xorg.conf.d/10-keyboard.conf
;;
esac

5
chakra-initscripts/etc/skel/10-keyboard.conf Normal file
View File

@ -0,0 +1,5 @@
Section "InputClass"
Identifier "Keyboard Defaults"
MatchIsKeyboard "yes"
Option "XkbLayout" "us"
EndSection

32
glib2/PKGBUILD
View File

@ -1,8 +1,14 @@
# $Id: PKGBUILD 79346 2010-05-03 10:44:26Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
#
# Core Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=glib2
pkgver=2.27.0
pkgver=2.26.0
pkgrel=1
pkgdesc="Common C routines used by GTK+ 2.4 and other libs"
url="http://www.gtk.org/"
@ -11,23 +17,23 @@ license=('LGPL')
depends=('pcre>=8.02')
makedepends=('pkgconfig')
options=('!libtool' '!docs')
source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.27/glib-${pkgver}.tar.bz2
source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.26/glib-${pkgver}.tar.bz2
glib2.sh
glib2.csh)
sha256sums=('7266a9580e6984658b3c55bd2683289416e87a26c35e7b1b5f6d5ac87db9ddf4'
sha256sums=('4c18e3aadb5b20acc7c0f7d3a77da8a2843b85a9fd73fd3aa360a7aea953e3b2'
'9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
'8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3')
build() {
cd "${srcdir}/glib-${pkgver}"
./configure --prefix=/usr --enable-static --enable-shared \
--with-pcre=system --disable-fam || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
./configure --prefix=/usr \
--sysconfdir=/etc \
--with-pcre=system \
--disable-fam
make
make DESTDIR="${pkgdir}" install
install -d "${pkgdir}/etc/profile.d"
install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/" || return 1
install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/" || return 1
chmod 755 ${pkgdir}/usr/bin/gtester-report || return 1
install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/"
install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/"
}