Re: [gentoo-user-cs] nastaveni bezpecnosti xorg

[Marek Turnovec]

Dobrá práce. :-)

®e na to jsou dva balíèky, to jsem si ani nev¹iml. Podle tìch èísel 
verzí bych skoro tipoval, ¾e xkbdata bude v rámci nového Xorg v tìch 
hodnì balíècích... (tam má skoro v¹echno teï verzi 1.0.1 nebo tak nìjak).

Zdraví

Marek Turnovec

Honza Macháèek napsal(a):
>   Ahoj, lidi a spol.,
>   pøikládám svùj upravený ebuild x11-misc/xkbdata se záplatou pro
> varianty èeské klávesnice (a diff oproti ebuildu z portage).
>   Jen nevím, jestli má smysl jít s tím na bugzillu, kdy¾ vedle xkbdata
> existuje xkeyboard-config, kde èeská klávesnice (vèetnì variant) funguje
> bezchybnì. Máte nìkdo ponìtí, èím se xkbdata a xkeyboard-config li¹í
> (kromì nepodstatných vnitøních drobností, jako je mírnì odli¹né
> adresáøové èlenìní dat) a zda jsou oba balíky ¾ivé, nebo jeden z nich
> dosluhuje a druhý jej má nahradit? Já jsem jenom s údivem zjistil, ¾e na
> jednom stroji mám xkbdata a na druhém xkeyboard-config.
>   Mìjte se krásnì.
> 						Honza Macháèek
>
>
> ------------------------------------------------------------------------
>
> # Copyright 1999-2006 Gentoo Foundation
> # Distributed under the terms of the GNU General Public License v2
> # $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbdata/xkbdata-1.0.1.ebuild,v 1.11 2006/09/10 08:46:24 vapier Exp $
>
> # Must be before x-modular eclass is inherited
> #SNAPSHOT="yes"
>
> inherit x-modular multilib
>
> DESCRIPTION="X.Org xkbdata data"
>
> KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 s390 sh sparc x86"
>
> RDEPEND="x11-apps/xkbcomp
> 	!x11-misc/xkeyboard-config"
> DEPEND="${RDEPEND}"
>
> pkg_setup() {
> 	# (#130590) The old XKB directory can screw stuff up
> 	local DIR="${ROOT}usr/$(get_libdir)/X11/xkb"
> 	if [[ -d ${DIR} ]] ; then
> 		eerror "Directory ${DIR} should be"
> 		eerror "manually deleted/renamed/relocated before installing!"
> 		die "Manually remove ${DIR}"
> 	fi
> }
>
> src_unpack() {
> 	unpack ${A}
> 	cd ${S}
> 	epatch ${FILESDIR}/${P}-cz.patch
> }
>
> src_install() {
> 	x-modular_src_install
> 	keepdir /var/lib/xkb
> 	dosym ../../../../var/lib/xkb /usr/share/X11/xkb/compiled
> 	echo "CONFIG_PROTECT=\"/usr/share/X11/xkb\"" > ${T}/10xkbdata
> 	doenvd ${T}/10xkbdata
> }
>
>
> ------------------------------------------------------------------------
>
> diff -Naur tmp-old/symbols/pc/cz tmp-new/symbols/pc/cz
> --- symbols/pc/cz	2006-12-10 12:10:59.000000000 +0000
> +++ symbols/pc/cz	2006-12-10 12:11:49.000000000 +0000
> @@ -78,7 +78,7 @@
>
>  // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
>  xkb_symbols "bksl" {
> -    include "cz(basic)"
> +    include "pc/cz(basic)"
>      name[Group1]= "Czechia - With <\|> key";
>
>      key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
> @@ -91,7 +91,7 @@
>      // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
>      // 2001 by Kamil Toman <ktoman@×××××.cz>
>
> -    include "cz(basic)"
> +    include "pc/cz(basic)"
>      name[Group1]= "Czechia - qwerty";
>
>      key <AB01>	{ [         z,          Z,       degree,     NoSymbol ]	};
> @@ -100,7 +100,7 @@
>
>  // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
>  xkb_symbols "qwerty_bksl" {
> -    include "cz(qwerty)"
> +    include "pc/cz(qwerty)"
>
>      name[Group1]= "Czechia - qwerty, extended Backslash";
>
>
>
> ------------------------------------------------------------------------
>
> --- /usr/portage/x11-misc/xkbdata/xkbdata-1.0.1.ebuild	2006-09-10 09:06:39.000000000 +0000
> +++ /usr/local/portage/x11-misc/xkbdata/xkbdata-1.0.1-r1.ebuild	2006-12-10 12:32:49.000000000 +0000
> @@ -25,6 +25,12 @@
>  	fi
>  }
>
> +src_unpack() {
> +	unpack ${A}
> +	cd ${S}
> +	epatch ${FILESDIR}/${P}-cz.patch
> +}
> +
>  src_install() {
>  	x-modular_src_install
>  	keepdir /var/lib/xkb

-- 
http://mat.medik.cz/


-- 
gentoo-user-cs@g.o mailing list