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