1 |
Dobrá práce. :-) |
2 |
|
3 |
®e na to jsou dva balíèky, to jsem si ani nev¹iml. Podle tìch èísel |
4 |
verzí bych skoro tipoval, ¾e xkbdata bude v rámci nového Xorg v tìch |
5 |
hodnì balíècích... (tam má skoro v¹echno teï verzi 1.0.1 nebo tak nìjak). |
6 |
|
7 |
Zdraví |
8 |
|
9 |
Marek Turnovec |
10 |
|
11 |
Honza Macháèek napsal(a): |
12 |
> Ahoj, lidi a spol., |
13 |
> pøikládám svùj upravený ebuild x11-misc/xkbdata se záplatou pro |
14 |
> varianty èeské klávesnice (a diff oproti ebuildu z portage). |
15 |
> Jen nevím, jestli má smysl jít s tím na bugzillu, kdy¾ vedle xkbdata |
16 |
> existuje xkeyboard-config, kde èeská klávesnice (vèetnì variant) funguje |
17 |
> bezchybnì. Máte nìkdo ponìtí, èím se xkbdata a xkeyboard-config li¹í |
18 |
> (kromì nepodstatných vnitøních drobností, jako je mírnì odli¹né |
19 |
> adresáøové èlenìní dat) a zda jsou oba balíky ¾ivé, nebo jeden z nich |
20 |
> dosluhuje a druhý jej má nahradit? Já jsem jenom s údivem zjistil, ¾e na |
21 |
> jednom stroji mám xkbdata a na druhém xkeyboard-config. |
22 |
> Mìjte se krásnì. |
23 |
> Honza Macháèek |
24 |
> |
25 |
> |
26 |
> ------------------------------------------------------------------------ |
27 |
> |
28 |
> # Copyright 1999-2006 Gentoo Foundation |
29 |
> # Distributed under the terms of the GNU General Public License v2 |
30 |
> # $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbdata/xkbdata-1.0.1.ebuild,v 1.11 2006/09/10 08:46:24 vapier Exp $ |
31 |
> |
32 |
> # Must be before x-modular eclass is inherited |
33 |
> #SNAPSHOT="yes" |
34 |
> |
35 |
> inherit x-modular multilib |
36 |
> |
37 |
> DESCRIPTION="X.Org xkbdata data" |
38 |
> |
39 |
> KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 s390 sh sparc x86" |
40 |
> |
41 |
> RDEPEND="x11-apps/xkbcomp |
42 |
> !x11-misc/xkeyboard-config" |
43 |
> DEPEND="${RDEPEND}" |
44 |
> |
45 |
> pkg_setup() { |
46 |
> # (#130590) The old XKB directory can screw stuff up |
47 |
> local DIR="${ROOT}usr/$(get_libdir)/X11/xkb" |
48 |
> if [[ -d ${DIR} ]] ; then |
49 |
> eerror "Directory ${DIR} should be" |
50 |
> eerror "manually deleted/renamed/relocated before installing!" |
51 |
> die "Manually remove ${DIR}" |
52 |
> fi |
53 |
> } |
54 |
> |
55 |
> src_unpack() { |
56 |
> unpack ${A} |
57 |
> cd ${S} |
58 |
> epatch ${FILESDIR}/${P}-cz.patch |
59 |
> } |
60 |
> |
61 |
> src_install() { |
62 |
> x-modular_src_install |
63 |
> keepdir /var/lib/xkb |
64 |
> dosym ../../../../var/lib/xkb /usr/share/X11/xkb/compiled |
65 |
> echo "CONFIG_PROTECT=\"/usr/share/X11/xkb\"" > ${T}/10xkbdata |
66 |
> doenvd ${T}/10xkbdata |
67 |
> } |
68 |
> |
69 |
> |
70 |
> ------------------------------------------------------------------------ |
71 |
> |
72 |
> diff -Naur tmp-old/symbols/pc/cz tmp-new/symbols/pc/cz |
73 |
> --- symbols/pc/cz 2006-12-10 12:10:59.000000000 +0000 |
74 |
> +++ symbols/pc/cz 2006-12-10 12:11:49.000000000 +0000 |
75 |
> @@ -78,7 +78,7 @@ |
76 |
> |
77 |
> // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key) |
78 |
> xkb_symbols "bksl" { |
79 |
> - include "cz(basic)" |
80 |
> + include "pc/cz(basic)" |
81 |
> name[Group1]= "Czechia - With <\|> key"; |
82 |
> |
83 |
> key <BKSL> { [ backslash, bar, slash, NoSymbol ] }; |
84 |
> @@ -91,7 +91,7 @@ |
85 |
> // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped). |
86 |
> // 2001 by Kamil Toman <ktoman@×××××.cz> |
87 |
> |
88 |
> - include "cz(basic)" |
89 |
> + include "pc/cz(basic)" |
90 |
> name[Group1]= "Czechia - qwerty"; |
91 |
> |
92 |
> key <AB01> { [ z, Z, degree, NoSymbol ] }; |
93 |
> @@ -100,7 +100,7 @@ |
94 |
> |
95 |
> // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key) |
96 |
> xkb_symbols "qwerty_bksl" { |
97 |
> - include "cz(qwerty)" |
98 |
> + include "pc/cz(qwerty)" |
99 |
> |
100 |
> name[Group1]= "Czechia - qwerty, extended Backslash"; |
101 |
> |
102 |
> |
103 |
> |
104 |
> ------------------------------------------------------------------------ |
105 |
> |
106 |
> --- /usr/portage/x11-misc/xkbdata/xkbdata-1.0.1.ebuild 2006-09-10 09:06:39.000000000 +0000 |
107 |
> +++ /usr/local/portage/x11-misc/xkbdata/xkbdata-1.0.1-r1.ebuild 2006-12-10 12:32:49.000000000 +0000 |
108 |
> @@ -25,6 +25,12 @@ |
109 |
> fi |
110 |
> } |
111 |
> |
112 |
> +src_unpack() { |
113 |
> + unpack ${A} |
114 |
> + cd ${S} |
115 |
> + epatch ${FILESDIR}/${P}-cz.patch |
116 |
> +} |
117 |
> + |
118 |
> src_install() { |
119 |
> x-modular_src_install |
120 |
> keepdir /var/lib/xkb |
121 |
|
122 |
-- |
123 |
http://mat.medik.cz/ |
124 |
|
125 |
|
126 |
-- |
127 |
gentoo-user-cs@g.o mailing list |