154561 2007-12-24 00:42:31 +0000 [RFE] [PATCH] Hunspell support for legacy KSpell/K3Spell 2008-08-30 16:13:13 +0000 1 1 10 Unmaintained kdelibs kspell unspecified Fedora RPMs Linux RESOLVED WONTFIX NOR wishlist --- 1 kevin.kofler zack hasso 0 oldest_to_newest 565918 0 kevin.kofler 2007-12-24 00:42:31 +0000 Version: (using KDE KDE 3.5.8) Installed from: Fedora RPMs In Fedora, we are trying to reduce the proliferation of dictionaries and spellchecking tools. Therefore, we want to make as many applications as possible use the hunspell spellchecker, either directly or through the enchant abstraction layer. See http://fedoraproject.org/wiki/Releases/FeatureDictionary for details. This will also ensure KDE 3 and KDE 4 apps use the same spellchecking dictionaries (and incidentally also the same ones as other applications). I implemented support for the Hunspell command-line spellchecker (which has an ispell-compatible pipe interface) in KSpell (the legacy "KSpell 1"). See also http://bugs.kde.org/show_bug.cgi?id=154560 for KSpell2. 565920 1 22665 kevin.kofler 2007-12-24 00:44:56 +0000 Created attachment 22665 Hunspell support for legacy KSpell 573090 2 23138 kevin.kofler 2008-01-19 17:15:03 +0000 Created attachment 23138 Hunspell support for K3Spell in KDE 4 I just noticed K3Spell is still used in some places in KDE 4 (e.g. the KatePart). This is a forward-port of the KSpell Hunspell patch to the K3Spell in KDE 4. 604637 3 kevin.kofler 2008-05-27 20:03:54 +0000 *** Bug 121228 has been marked as a duplicate of this bug. *** 641558 4 zack 2008-08-27 17:00:50 +0000 This is another very nice patch but it's the same situation as 154560. And to quote me from the other report: I'm closing with WONTFIX but because I don't have resources time to do KDE3 development, not because I think it's wrong and as mentioned you're of course free to commit it (assuming the release team will be ok with it) as long as you'll maintain it. 641674 5 kevin.kofler 2008-08-28 00:42:24 +0000 What about the patch to K3Spell in KDE 4? Should that also be considered unmaintained? 642186 6 pino 2008-08-30 10:52:46 +0000 (In reply to comment #5) > What about the patch to K3Spell in KDE 4? Should that also be considered > unmaintained? K3Spell is part of the kde3support module, that means "this is KDE 3 compatibility, port to any KDE 4 technology ASAP". The KDE4 technology is called Sonnet. IMHO it makes very little sense adding a new feature that was not in KDE 3, for a class/system that developers are supposed to port away from. 642223 7 kevin.kofler 2008-08-30 16:08:36 +0000 Well, that's why I want to add it to KDE 3 too. ;-) In Fedora 9, we're shipping those patches (also the KSpell2 one in KDE 3) and they work fine, and the nice thing for system integration is that they make sure all the apps use Hunspell as their dictionary (we're also setting the option in our kde-settings to make it the default). What also worries me is that if those patches aren't included, different distributions will add different spelling engines (there are also others which could get support, for example tmispell-voikko for which I have a tentative patch) and the enumeration values will vary from distro to distro, making a big mess. 642224 8 kevin.kofler 2008-08-30 16:13:13 +0000 Oh, and I know apps shouldn't be using K3Spell anymore, but the fact is that they do and it's bad for integration if the apps still using K3Spell use aspell whereas the ones already ported to Sonnet use hunspell (because that's the default in Enchant, and that's normal because it's more powerful than aspell and probably what most distributions will standardize on, Fedora definitely did, see our FeatureDictionary page), they get completely different dictionaries. It also means you have to install 2 spellcheckers. In Fedora 9, we only require hunspell and that works thanks to those patches. 22665 2007-12-24 00:44:56 +0000 2007-12-24 00:44:56 +0000 Hunspell support for legacy KSpell kdelibs-3.5.8-kspell-hunspell.diff text/plain 9770 kevin.kofler ZGlmZiAtdXIga2RlbGlicy0zLjUuOC9rZGV1aS9rc2NvbmZpZy5jcHAga2RlbGlicy0zLjUuOC1r c3BlbGwtaHVuc3BlbGwva2RldWkva3Njb25maWcuY3BwCi0tLSBrZGVsaWJzLTMuNS44L2tkZXVp L2tzY29uZmlnLmNwcAkyMDA3LTEwLTA4IDExOjUyOjEyLjAwMDAwMDAwMCArMDIwMAorKysga2Rl bGlicy0zLjUuOC1rc3BlbGwtaHVuc3BlbGwva2RldWkva3Njb25maWcuY3BwCTIwMDctMTItMjIg MDE6NDU6NDcuMDAwMDAwMDAwICswMTAwCkBAIC0xLDYgKzEsNyBAQAogLyogVGhpcyBmaWxlIGlz IHBhcnQgb2YgdGhlIEtERSBsaWJyYXJpZXMKICAgIENvcHlyaWdodCAoQykgMTk5NyBEYXZpZCBT d2VldCA8ZHN3ZWV0QGtkZS5vcmc+CiAgICBDb3B5cmlnaHQgKEMpIDIwMDAtMjAwMSBXb2xmcmFt IERpZXN0ZWwgPHdvbGZyYW1Ac3RlbG9qLmRlPgorICAgQ29weXJpZ2h0IChDKSAyMDA3IEtldmlu IEtvZmxlciA8S2V2aW5AdGlnY2MudGljYWxjLm9yZz4KIAogICAgVGhpcyBsaWJyYXJ5IGlzIGZy ZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICAgbW9kaWZ5IGl0 IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKQEAgLTE0 OSw2ICsxNTAsNyBAQAogICBjbGllbnRjb21iby0+aW5zZXJ0SXRlbSggaTE4bigiQXNwZWxsIikg KTsKICAgY2xpZW50Y29tYm8tPmluc2VydEl0ZW0oIGkxOG4oIkhzcGVsbCIpICk7CiAgIGNsaWVu dGNvbWJvLT5pbnNlcnRJdGVtKCBpMThuKCJaZW1iZXJlayIpICk7CisgIGNsaWVudGNvbWJvLT5p bnNlcnRJdGVtKCBpMThuKCJIdW5zcGVsbCIpICk7CiAgIGNvbm5lY3QoIGNsaWVudGNvbWJvLCBT SUdOQUwgKGFjdGl2YXRlZChpbnQpKSwgdGhpcywKIAkgICBTTE9UIChzQ2hhbmdlQ2xpZW50KGlu dCkpICk7CiAgIGdsYXktPmFkZE11bHRpQ2VsbFdpZGdldCggY2xpZW50Y29tYm8sIDQsIDQsIDEs IDIgKTsKQEAgLTI0MCw4ICsyNDIsMTAgQEAKICAgICAgIGRpY3Rjb21iby0+aW5zZXJ0SXRlbSgg aTE4bigiVHVya2lzaCIpICk7CiAgICAgICBzQ2hhbmdlRW5jb2RpbmcoIEtTX0VfVVRGOCApOwog ICAgIH0KLSAgICBlbHNlCisgICAgZWxzZSBpZiAoIGljbGllbnQgPT0gS1NfQ0xJRU5UX0FTUEVM TCApCiAgICAgICBnZXRBdmFpbERpY3RzQXNwZWxsKCk7CisgICAgZWxzZQorICAgICAgZ2V0QXZh aWxEaWN0c0h1bnNwZWxsKCk7CiAgIH0KICAgZW1pdCBjb25maWdDaGFuZ2VkKCk7CiB9CkBAIC0z OTksOCArNDAzLDEwIEBACiAgICAgbGFuZ2ZuYW1lcy5hcHBlbmQoIiIpOwogICAgIGRpY3Rjb21i by0+aW5zZXJ0SXRlbSggaTE4bigiVHVya2lzaCIpICk7CiAgIH0KLSAgZWxzZQorICBlbHNlIGlm ICggaWNsaWVudCA9PSBLU19DTElFTlRfQVNQRUxMICkKICAgICBnZXRBdmFpbERpY3RzQXNwZWxs KCk7CisgIGVsc2UKKyAgICBnZXRBdmFpbERpY3RzSHVuc3BlbGwoKTsKIAogICAvLyBzZWxlY3Qg dGhlIHVzZWQgZGljdGlvbmFyeSBpbiB0aGUgbGlzdAogICBpbnQgd2hpY2hlbGVtZW50PS0xOwpA QCAtNTgzLDYgKzU4OSw2MiBAQAogICB9CiB9CiAKK3ZvaWQgS1NwZWxsQ29uZmlnOjpnZXRBdmFp bERpY3RzSHVuc3BlbGwgKCkgeworCisgIGxhbmdmbmFtZXMuY2xlYXIoKTsKKyAgZGljdGNvbWJv LT5jbGVhcigpOworICBsYW5nZm5hbWVzLmFwcGVuZCgiIik7IC8vIERlZmF1bHQKKyAgZGljdGNv bWJvLT5pbnNlcnRJdGVtKCBpMThuKCJIdW5zcGVsbCBEZWZhdWx0IikgKTsKKworICAvLyBkaWN0 aW9uYXJ5IHBhdGgKKyAgUUZpbGVJbmZvIGRpciAoIi91c3Ivc2hhcmUvbXlzcGVsbCIpOworICBp ZiAoIWRpci5leGlzdHMoKSB8fCAhZGlyLmlzRGlyKCkpCisgICAgZGlyLnNldEZpbGUgKCIvdXNy L3NoYXJlL2h1bnNwZWxsIik7CisgIGlmICghZGlyLmV4aXN0cygpIHx8ICFkaXIuaXNEaXIoKSkg cmV0dXJuOworCisgIGtkRGVidWcoNzUwKSA8PCAiS1NwZWxsQ29uZmlnOjpnZXRBdmFpbERpY3Rz SHVuc3BlbGwgIgorCSAgICAgICA8PCBkaXIuZmlsZVBhdGgoKSA8PCAiICIgPDwgZGlyLmRpclBh dGgoKSA8PCBlbmRsOworCisgIGNvbnN0IFFEaXIgdGhlZGlyIChkaXIuZmlsZVBhdGgoKSwiKi5k aWMiKTsKKyAgY29uc3QgUVN0cmluZ0xpc3QgZW50cnlMaXN0ID0gdGhlZGlyLmVudHJ5TGlzdCgp OworCisgIGtkRGVidWcoNzUwKSA8PCAiS1NwZWxsQ29uZmlnIiA8PCB0aGVkaXIucGF0aCgpIDw8 ICJcbiIgPDwgZW5kbDsKKyAga2REZWJ1Zyg3NTApIDw8ICJlbnRyeUxpc3QoKS5jb3VudCgpPSIK KwkgICAgICAgPDwgZW50cnlMaXN0LmNvdW50KCkgPDwgZW5kbDsKKworICBRU3RyaW5nTGlzdDo6 Y29uc3RfaXRlcmF0b3IgZW50cnlMaXN0SXRyID0gZW50cnlMaXN0LmNvbnN0QmVnaW4oKTsKKyAg Y29uc3QgUVN0cmluZ0xpc3Q6OmNvbnN0X2l0ZXJhdG9yIGVudHJ5TGlzdEVuZCA9IGVudHJ5TGlz dC5jb25zdEVuZCgpOworCisgIGZvciAoIDsgZW50cnlMaXN0SXRyICE9IGVudHJ5TGlzdEVuZDsg KytlbnRyeUxpc3RJdHIpCisgIHsKKyAgICBRU3RyaW5nIGZuYW1lLCBsbmFtZSwgaG5hbWU7Cisg ICAgZm5hbWUgPSAqZW50cnlMaXN0SXRyOworCisgICAgLy8gcmVtb3ZlIC5kaWMKKyAgICBpZiAo Zm5hbWUuZW5kc1dpdGgoIi5kaWMiKSkgZm5hbWUucmVtb3ZlIChmbmFtZS5sZW5ndGgoKS00LDQp OworCisgICAgaWYgKGludGVycHJldCAoZm5hbWUsIGxuYW1lLCBobmFtZSkgJiYgbGFuZ2ZuYW1l cy5maXJzdCgpLmlzRW1wdHkoKSkKKyAgICB7IC8vIFRoaXMgb25lIGlzIHRoZSBLREUgZGVmYXVs dCBsYW5ndWFnZQorICAgICAgLy8gc28gcGxhY2UgaXQgZmlyc3QgaW4gdGhlIGxpc3RzIChvdmVy d3JpdGUgIkRlZmF1bHQiKQorCisgICAgICBsYW5nZm5hbWVzLnJlbW92ZSAoIGxhbmdmbmFtZXMu YmVnaW4oKSApOworICAgICAgbGFuZ2ZuYW1lcy5wcmVwZW5kICggZm5hbWUgKTsKKworICAgICAg aG5hbWU9aTE4bigiZGVmYXVsdCBzcGVsbGluZyBkaWN0aW9uYXJ5IgorICAgICAgICAgICAgICAg ICAsIkRlZmF1bHQgLSAlMSBbJTJdIikuYXJnKGhuYW1lKS5hcmcoZm5hbWUpOworCisgICAgICBk aWN0Y29tYm8tPmNoYW5nZUl0ZW0gKGhuYW1lLDApOworICAgIH0KKyAgICBlbHNlCisgICAgewor ICAgICAgbGFuZ2ZuYW1lcy5hcHBlbmQgKGZuYW1lKTsKKyAgICAgIGhuYW1lPWhuYW1lKyIgWyIr Zm5hbWUrIl0iOworCisgICAgICBkaWN0Y29tYm8tPmluc2VydEl0ZW0gKGhuYW1lKTsKKyAgICB9 CisgIH0KK30KKwogdm9pZAogS1NwZWxsQ29uZmlnOjpmaWxsRGljdHMoIFFDb21ib0JveCogYm94 LCBRU3RyaW5nTGlzdCogZGljdGlvbmFyaWVzICkKIHsKQEAgLTY2MSw4ICs3MjMsNyBAQAogICAg ICAgYm94LT5pbnNlcnRJdGVtKCBpMThuKCJUdXJraXNoIikgKTsKICAgICAgIGxhbmdmbmFtZXMu YXBwZW5kKCIiKTsKICAgICAgIHNDaGFuZ2VFbmNvZGluZyggS1NfRV9VVEY4ICk7Ci0gICAgfQot ICAgIGVsc2UgeworICAgIH0gZWxzZSBpZiAoIGljbGllbnQgPT0gS1NfQ0xJRU5UX0FTUEVMTCAp IHsKICAgICAgIGJveC0+Y2xlYXIoKTsKICAgICAgIGxhbmdmbmFtZXMuYXBwZW5kKCIiKTsgLy8g RGVmYXVsdAogICAgICAgYm94LT5pbnNlcnRJdGVtIChpMThuKCJBU3BlbGwgRGVmYXVsdCIpKTsK QEAgLTc0MSw2ICs4MDIsNTggQEAKICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgIH0KKyAg ICB9IGVsc2UgeworICAgICAgYm94LT5jbGVhcigpOworICAgICAgbGFuZ2ZuYW1lcy5hcHBlbmQo IiIpOyAvLyBEZWZhdWx0CisgICAgICBib3gtPmluc2VydEl0ZW0oIGkxOG4oIkh1bnNwZWxsIERl ZmF1bHQiKSApOworCisgICAgICAvLyBkaWN0aW9uYXJ5IHBhdGgKKyAgICAgIFFGaWxlSW5mbyBk aXIgKCIvdXNyL3NoYXJlL215c3BlbGwiKTsKKyAgICAgIGlmICghZGlyLmV4aXN0cygpIHx8ICFk aXIuaXNEaXIoKSkKKyAgICAgICAgZGlyLnNldEZpbGUgKCIvdXNyL3NoYXJlL2h1bnNwZWxsIik7 CisgICAgICBpZiAoIWRpci5leGlzdHMoKSB8fCAhZGlyLmlzRGlyKCkpIHJldHVybjsKKworICAg ICAga2REZWJ1Zyg3NTApIDw8ICJLU3BlbGxDb25maWc6OmdldEF2YWlsRGljdHNIdW5zcGVsbCAi CisgICAgICAgICAgICAgICAgICAgPDwgZGlyLmZpbGVQYXRoKCkgPDwgIiAiIDw8IGRpci5kaXJQ YXRoKCkgPDwgZW5kbDsKKworICAgICAgY29uc3QgUURpciB0aGVkaXIgKGRpci5maWxlUGF0aCgp LCIqLmRpYyIpOworICAgICAgY29uc3QgUVN0cmluZ0xpc3QgZW50cnlMaXN0ID0gdGhlZGlyLmVu dHJ5TGlzdCgpOworCisgICAgICBrZERlYnVnKDc1MCkgPDwgIktTcGVsbENvbmZpZyIgPDwgdGhl ZGlyLnBhdGgoKSA8PCAiXG4iIDw8IGVuZGw7CisgICAgICBrZERlYnVnKDc1MCkgPDwgImVudHJ5 TGlzdCgpLmNvdW50KCk9IgorICAgICAgICAgICAgICAgICAgIDw8IGVudHJ5TGlzdC5jb3VudCgp IDw8IGVuZGw7CisKKyAgICAgIFFTdHJpbmdMaXN0Ojpjb25zdF9pdGVyYXRvciBlbnRyeUxpc3RJ dHIgPSBlbnRyeUxpc3QuY29uc3RCZWdpbigpOworICAgICAgY29uc3QgUVN0cmluZ0xpc3Q6OmNv bnN0X2l0ZXJhdG9yIGVudHJ5TGlzdEVuZCA9IGVudHJ5TGlzdC5jb25zdEVuZCgpOworCisgICAg ICBmb3IgKCA7IGVudHJ5TGlzdEl0ciAhPSBlbnRyeUxpc3RFbmQ7ICsrZW50cnlMaXN0SXRyKQor ICAgICAgeworICAgICAgICBRU3RyaW5nIGZuYW1lLCBsbmFtZSwgaG5hbWU7CisgICAgICAgIGZu YW1lID0gKmVudHJ5TGlzdEl0cjsKKworICAgICAgICAvLyByZW1vdmUgLmRpYworICAgICAgICBp ZiAoZm5hbWUuZW5kc1dpdGgoIi5kaWMiKSkgZm5hbWUucmVtb3ZlIChmbmFtZS5sZW5ndGgoKS00 LDQpOworCisgICAgICAgIGlmIChpbnRlcnByZXQgKGZuYW1lLCBsbmFtZSwgaG5hbWUpICYmIGxh bmdmbmFtZXMuZmlyc3QoKS5pc0VtcHR5KCkpCisgICAgICAgIHsgLy8gVGhpcyBvbmUgaXMgdGhl IEtERSBkZWZhdWx0IGxhbmd1YWdlCisgICAgICAgICAgLy8gc28gcGxhY2UgaXQgZmlyc3QgaW4g dGhlIGxpc3RzIChvdmVyd3JpdGUgIkRlZmF1bHQiKQorCisgICAgICAgICAgbGFuZ2ZuYW1lcy5y ZW1vdmUgKCBsYW5nZm5hbWVzLmJlZ2luKCkgKTsKKyAgICAgICAgICBsYW5nZm5hbWVzLnByZXBl bmQgKCBmbmFtZSApOworCisgICAgICAgICAgaG5hbWU9aTE4bigiZGVmYXVsdCBzcGVsbGluZyBk aWN0aW9uYXJ5IgorICAgICAgICAgICAgICAgICAgICAgLCJEZWZhdWx0IC0gJTEgWyUyXSIpLmFy ZyhobmFtZSkuYXJnKGZuYW1lKTsKKworICAgICAgICAgIGJveC0+Y2hhbmdlSXRlbSAoaG5hbWUs MCk7CisgICAgICAgIH0KKyAgICAgICAgZWxzZQorICAgICAgICB7CisgICAgICAgICAgbGFuZ2Zu YW1lcy5hcHBlbmQgKGZuYW1lKTsKKyAgICAgICAgICBobmFtZT1obmFtZSsiIFsiK2ZuYW1lKyJd IjsKKworICAgICAgICAgIGJveC0+aW5zZXJ0SXRlbSAoaG5hbWUpOworICAgICAgICB9CisgICAg ICB9CiAgICAgfQogICAgIGludCB3aGljaGVsZW1lbnQgPSBsYW5nZm5hbWVzLmZpbmRJbmRleChx c2RpY3QpOwogICAgIGlmICggd2hpY2hlbGVtZW50ID49IDAgKSB7CmRpZmYgLXVyIGtkZWxpYnMt My41Ljgva2RldWkva3Njb25maWcuaCBrZGVsaWJzLTMuNS44LWtzcGVsbC1odW5zcGVsbC9rZGV1 aS9rc2NvbmZpZy5oCi0tLSBrZGVsaWJzLTMuNS44L2tkZXVpL2tzY29uZmlnLmgJMjAwNS0xMC0x MCAxNzowNjozOC4wMDAwMDAwMDAgKzAyMDAKKysrIGtkZWxpYnMtMy41Ljgta3NwZWxsLWh1bnNw ZWxsL2tkZXVpL2tzY29uZmlnLmgJMjAwNy0xMi0yMiAwMTozNToyNS4wMDAwMDAwMDAgKzAxMDAK QEAgLTEsNSArMSw2IEBACiAvKiBUaGlzIGZpbGUgaXMgcGFydCBvZiB0aGUgS0RFIGxpYnJhcmll cwogICAgQ29weXJpZ2h0IChDKSAxOTk3IERhdmlkIFN3ZWV0IDxkc3dlZXRAa2RlLm9yZz4KKyAg IENvcHlyaWdodCAoQykgMjAwNyBLZXZpbiBLb2ZsZXIgPEtldmluQHRpZ2NjLnRpY2FsYy5vcmc+ CiAKICAgIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0 ZSBpdCBhbmQvb3IKICAgIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJy YXJ5IEdlbmVyYWwgUHVibGljCkBAIC02MSw3ICs2Miw4IEBACiAgIEtTX0NMSUVOVF9JU1BFTEw9 MCwKICAgS1NfQ0xJRU5UX0FTUEVMTD0xLAogICBLU19DTElFTlRfSFNQRUxMPTIsCi0gIEtTX0NM SUVOVF9aRU1CRVJFSz0zCisgIEtTX0NMSUVOVF9aRU1CRVJFSz0zLAorICBLU19DTElFTlRfSFVO U1BFTEw9NAogfTsKIAogLyoqCkBAIC0yODMsNiArMjg1LDcgQEAKICAgICBLU3BlbGxDb25maWdQ cml2YXRlICpkOwogICAgIHZvaWQgZ2V0QXZhaWxEaWN0c0lzcGVsbCgpOwogICAgIHZvaWQgZ2V0 QXZhaWxEaWN0c0FzcGVsbCgpOworICAgIHZvaWQgZ2V0QXZhaWxEaWN0c0h1bnNwZWxsKCk7CiB9 OwogCiAjZW5kaWYgLy8gS0RFTElCU19LU0NPTkZJR19ICmRpZmYgLXVyIGtkZWxpYnMtMy41Ljgv a2RldWkva3NwZWxsLmNwcCBrZGVsaWJzLTMuNS44LWtzcGVsbC1odW5zcGVsbC9rZGV1aS9rc3Bl bGwuY3BwCi0tLSBrZGVsaWJzLTMuNS44L2tkZXVpL2tzcGVsbC5jcHAJMjAwNS0xMC0xMCAxNzow NjozOC4wMDAwMDAwMDAgKzAyMDAKKysrIGtkZWxpYnMtMy41Ljgta3NwZWxsLWh1bnNwZWxsL2tk ZXVpL2tzcGVsbC5jcHAJMjAwNy0xMi0yMiAwMjoyNjoyOS4wMDAwMDAwMDAgKzAxMDAKQEAgLTIs NiArMiw3IEBACiAgICBDb3B5cmlnaHQgKEMpIDE5OTcgRGF2aWQgU3dlZXQgPGRzd2VldEBrZGUu b3JnPgogICAgQ29weXJpZ2h0IChDKSAyMDAwLTIwMDEgV29sZnJhbSBEaWVzdGVsIDx3b2xmcmFt QHN0ZWxvai5kZT4KICAgIENvcHlyaWdodCAoQykgMjAwMyBaYWNrIFJ1c2luIDx6YWNrQGtkZS5v cmc+CisgICBDb3B5cmlnaHQgKEMpIDIwMDcgS2V2aW4gS29mbGVyIDxLZXZpbkB0aWdjYy50aWNh bGMub3JnPgogCiAgICBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRp c3RyaWJ1dGUgaXQgYW5kL29yCiAgICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBH TlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtMTgxLDkgKzE4MiwxNCBAQAogICAgICpwcm9j IDw8ICJ6cHNwZWxsIjsKICAgICBrZERlYnVnKDc1MCkgPDwgIlVzaW5nIHplbWJlcmVrKHpwc3Bl bGwpIiA8PCBlbmRsOwogICAgIGJyZWFrOworICBjYXNlIEtTX0NMSUVOVF9IVU5TUEVMTDoKKyAg ICAqcHJvYyA8PCAiaHVuc3BlbGwiOworICAgIGtkRGVidWcoNzUwKSA8PCAiVXNpbmcgaHVuc3Bl bGwiIDw8IGVuZGw7CisgICAgYnJlYWs7CiAgIH0KIAotICBpZiAoIGtzY29uZmlnLT5jbGllbnQo KSA9PSBLU19DTElFTlRfSVNQRUxMIHx8IGtzY29uZmlnLT5jbGllbnQoKSA9PSBLU19DTElFTlRf QVNQRUxMICkKKyAgLy8gSHVuc3BlbGwgZG9lc24ndCBuZWVkIGFsbCBvZiB0aGVzZSBvcHRpb25z LCBidXQgaXQnbGwgaWdub3JlIHRob3NlIGl0IGRvZXNuJ3QgdW5kZXJzdGFuZC4KKyAgaWYgKCBr c2NvbmZpZy0+Y2xpZW50KCkgPT0gS1NfQ0xJRU5UX0lTUEVMTCB8fCBrc2NvbmZpZy0+Y2xpZW50 KCkgPT0gS1NfQ0xJRU5UX0FTUEVMTCB8fCBrc2NvbmZpZy0+Y2xpZW50KCkgPT0gS1NfQ0xJRU5U X0hVTlNQRUxMICkKICAgewogICAgICpwcm9jIDw8ICItYSIgPDwgIi1TIjsKIApAQCAtMjAxLDgg KzIwNyw4IEBACiAgICAgICAqcHJvYyA8PCAiLXQiOwogICAgICAgYnJlYWs7CiAgICAgY2FzZSBO cm9mZjoKLSAgICAgIC8vb25seSBpc3BlbGwgc3VwcG9ydHMKLSAgICAgIGlmICgga3Njb25maWct PmNsaWVudCgpID09IEtTX0NMSUVOVF9JU1BFTEwgKQorICAgICAgLy9vbmx5IGlzcGVsbCBhbmQg aHVuc3BlbGwgc3VwcG9ydAorICAgICAgaWYgKCBrc2NvbmZpZy0+Y2xpZW50KCkgPT0gS1NfQ0xJ RU5UX0lTUEVMTCB8fCBrc2NvbmZpZy0+Y2xpZW50KCkgPT0gS1NfQ0xJRU5UX0hVTlNQRUxMICkK ICAgICAgICAgKnByb2MgPDwgIi1uIjsKICAgICAgIGJyZWFrOwogICAgIGNhc2UgVGV4dDoKQEAg LTIzOSw3ICsyNDUsNjAgQEAKICAgLy8gb3B0aW9uLCBzbyBrc3BlbGwgdHJpZXMgYWdhaW4gd2l0 aG91dCBpdC4gIFRoYXQncyB3aHkgYXMgJ3BzIC1heCcKICAgLy8gc2hvd3MgImlzcGVsbCAtYSAt UyAuLi4iIHdpdGhvdSB0aGUgIi1UbGF0aW4yIiBvcHRpb24uCiAKLSAgICBpZiAoIHRyeXN0YXJ0 PDEgKSB7CisgICAgaWYgKCBrc2NvbmZpZy0+Y2xpZW50KCkgPT0gS1NfQ0xJRU5UX0hVTlNQRUxM ICYmIHRyeXN0YXJ0PDEgKSB7CisgICAgICAvLyBOb3RlOiBUaGlzIHNldHMgSS9PIGVuY29kaW5n LiBIdW5zcGVsbCBjb3JyZWN0bHkgaGFuZGxlcyBkaWN0aW9uYXJ5IGVuY29kaW5nICE9IEkvTyBl bmNvZGluZy4KKyAgICAgIC8vIEl0IHdpbGwgYmUgZmFzdGVyIGlmIHRoZSBJL08gZW5jb2Rpbmcg bWF0Y2hlcyB0aGUgZGljdGlvbmFyeSBlbmNvZGluZywgYnV0IHVzaW5nIFVURi04IGlzIGFsd2F5 cyBzYWZlLgorICAgICAgc3dpdGNoICgga3Njb25maWctPmVuY29kaW5nKCkgKQorICAgICAgewor ICAgICAgY2FzZSBLU19FX0xBVElOMToKKwkqcHJvYyA8PCAiLWkiIDw8ICJJU08tODg1OS0xIjsK KwlicmVhazsKKyAgICAgIGNhc2UgS1NfRV9MQVRJTjI6CisJKnByb2MgPDwgIi1pIiA8PCAiSVNP LTg4NTktMiI7CisJYnJlYWs7CisgICAgICBjYXNlIEtTX0VfTEFUSU4zOgorCSpwcm9jIDw8ICIt aSIgPDwgIklTTy04ODU5LTMiOworICAgICAgICBicmVhazsKKyAgICAgIGNhc2UgS1NfRV9MQVRJ TjQ6CisJKnByb2MgPDwgIi1pIiA8PCAiSVNPLTg4NTktNCI7CisgICAgICAgIGJyZWFrOworICAg ICAgY2FzZSBLU19FX0xBVElONToKKwkqcHJvYyA8PCAiLWkiIDw8ICJJU08tODg1OS01IjsKKyAg ICAgICAgYnJlYWs7CisgICAgICBjYXNlIEtTX0VfTEFUSU43OgorCSpwcm9jIDw8ICItaSIgPDwg IklTTy04ODU5LTciOworICAgICAgICBicmVhazsKKyAgICAgIGNhc2UgS1NfRV9MQVRJTjg6CisJ KnByb2MgPDwgIi1pIiA8PCAiSVNPLTg4NTktOCI7CisgICAgICAgIGJyZWFrOworICAgICAgY2Fz ZSBLU19FX0xBVElOOToKKwkqcHJvYyA8PCAiLWkiIDw8ICJJU08tODg1OS05IjsKKyAgICAgICAg YnJlYWs7CisgICAgICBjYXNlIEtTX0VfTEFUSU4xMzoKKwkqcHJvYyA8PCAiLWkiIDw8ICJJU08t ODg1OS0xMyI7CisgICAgICAgIGJyZWFrOworICAgICAgY2FzZSBLU19FX0xBVElOMTU6CisJKnBy b2MgPDwgIi1pIiA8PCAiSVNPLTg4NTktMTUiOworICAgICAgICBicmVhazsKKyAgICAgIGNhc2Ug S1NfRV9VVEY4OgorCSpwcm9jIDw8ICItaSIgPDwgIlVURi04IjsKKyAgICAgICAgYnJlYWs7Cisg ICAgICBjYXNlIEtTX0VfS09JOFI6CisJKnByb2MgPDwgIi1pIiA8PCAiS09JOC1SIjsKKyAgICAg ICAgYnJlYWs7CisgICAgICBjYXNlIEtTX0VfS09JOFU6CisJKnByb2MgPDwgIi1pIiA8PCAiS09J OC1VIjsKKyAgICAgICAgYnJlYWs7CisgICAgICBjYXNlIEtTX0VfQ1AxMjUxOgorCSpwcm9jIDw8 ICItaSIgPDwgIkNQMTI1MSI7CisgICAgICAgIGJyZWFrOworICAgICAgY2FzZSBLU19FX0NQMTI1 NToKKwkqcHJvYyA8PCAiLWkiIDw8ICJDUDEyNTUiOworICAgICAgICBicmVhazsKKyAgICAgIGRl ZmF1bHQ6CisgICAgICAgIGJyZWFrOworICAgICAgfQorICAgIH0gZWxzZSBpZiAoIHRyeXN0YXJ0 PDEgKSB7CiAgICAgICBzd2l0Y2ggKCBrc2NvbmZpZy0+ZW5jb2RpbmcoKSApCiAgICAgICB7CiAg ICAgICBjYXNlIEtTX0VfTEFUSU4xOgo= 23138 2008-01-19 17:15:03 +0000 2008-01-19 17:15:03 +0000 Hunspell support for K3Spell in KDE 4 kdelibs-4.0.0-k3spell-hunspell.patch text/plain 10419 kevin.kofler ZGlmZiAtdXIga2RlbGlicy00LjAuMC9rZGUzc3VwcG9ydC9rZGV1aS9rM3Njb25maWcuY3BwIGtk ZWxpYnMtNC4wLjAtazNzcGVsbC1odW5zcGVsbC9rZGUzc3VwcG9ydC9rZGV1aS9rM3Njb25maWcu Y3BwCi0tLSBrZGVsaWJzLTQuMC4wL2tkZTNzdXBwb3J0L2tkZXVpL2szc2NvbmZpZy5jcHAJMjAw OC0wMS0wNSAwMDo1OTo0MS4wMDAwMDAwMDAgKzAxMDAKKysrIGtkZWxpYnMtNC4wLjAtazNzcGVs bC1odW5zcGVsbC9rZGUzc3VwcG9ydC9rZGV1aS9rM3Njb25maWcuY3BwCTIwMDgtMDEtMTkgMTY6 NDc6MDQuMDAwMDAwMDAwICswMTAwCkBAIC0xLDYgKzEsNyBAQAogLyogVGhpcyBmaWxlIGlzIHBh cnQgb2YgdGhlIEtERSBsaWJyYXJpZXMKICAgIENvcHlyaWdodCAoQykgMTk5NyBEYXZpZCBTd2Vl dCA8ZHN3ZWV0QGtkZS5vcmc+CiAgICBDb3B5cmlnaHQgKEMpIDIwMDAtMjAwMSBXb2xmcmFtIERp ZXN0ZWwgPHdvbGZyYW1Ac3RlbG9qLmRlPgorICAgQ29weXJpZ2h0IChDKSAyMDA3LTIwMDggS2V2 aW4gS29mbGVyIDxLZXZpbkB0aWdjYy50aWNhbGMub3JnPgogCiAgICBUaGlzIGxpYnJhcnkgaXMg ZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCiAgICBtb2RpZnkg aXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAt MTY3LDYgKzE2OCw3IEBACiAgIGNsaWVudGNvbWJvLT5hZGRJdGVtKCBpMThuYygiQGl0ZW06aW5s aXN0Ym94IFNwZWxsIGNoZWNrZXIiLCAiPGFwcGxpY2F0aW9uPkFzcGVsbDwvYXBwbGljYXRpb24+ IikgKTsKICAgY2xpZW50Y29tYm8tPmFkZEl0ZW0oIGkxOG5jKCJAaXRlbTppbmxpc3Rib3ggU3Bl bGwgY2hlY2tlciIsICI8YXBwbGljYXRpb24+SHNwZWxsPC9hcHBsaWNhdGlvbj4iKSApOwogICBj bGllbnRjb21iby0+YWRkSXRlbSggaTE4bmMoIkBpdGVtOmlubGlzdGJveCBTcGVsbCBjaGVja2Vy IiwgIjxhcHBsaWNhdGlvbj5aZW1iZXJlazwvYXBwbGljYXRpb24+IikgKTsKKyAgY2xpZW50Y29t Ym8tPmFkZEl0ZW0oIGkxOG5jKCJAaXRlbTppbmxpc3Rib3ggU3BlbGwgY2hlY2tlciIsICI8YXBw bGljYXRpb24+SHVuc3BlbGw8L2FwcGxpY2F0aW9uPiIpICk7CiAgIGNvbm5lY3QoIGNsaWVudGNv bWJvLCBTSUdOQUwgKGFjdGl2YXRlZChpbnQpKSwgdGhpcywKIAkgICBTTE9UIChzQ2hhbmdlQ2xp ZW50KGludCkpICk7CiAgIGdsYXktPmFkZFdpZGdldCggY2xpZW50Y29tYm8sIDUsIDEsIDEsIDIg KTsKQEAgLTI2MSw4ICsyNjMsMTAgQEAKICAgICAgIGRpY3Rjb21iby0+YWRkSXRlbSggaTE4bmMo IkBpdGVtIFNwZWxsaW5nIGRpY3Rpb25hcnkiLCAiVHVya2lzaCIpICk7CiAgICAgICBzQ2hhbmdl RW5jb2RpbmcoIEtTX0VfVVRGOCApOwogICAgIH0KLSAgICBlbHNlCisgICAgZWxzZSBpZiAoIGlj bGllbnQgPT0gS1NfQ0xJRU5UX0FTUEVMTCApCiAgICAgICBnZXRBdmFpbERpY3RzQXNwZWxsKCk7 CisgICAgZWxzZQorICAgICAgZ2V0QXZhaWxEaWN0c0h1bnNwZWxsKCk7CiAgIH0KICAgZW1pdCBj b25maWdDaGFuZ2VkKCk7CiB9CkBAIC00MjAsOCArNDI0LDEwIEBACiAgICAgbGFuZ2ZuYW1lcy5h cHBlbmQoIiIpOwogICAgIGRpY3Rjb21iby0+YWRkSXRlbSggaTE4bmMoIkBpdGVtIFNwZWxsaW5n IGRpY3Rpb25hcnkiLCAiVHVya2lzaCIpICk7CiAgIH0KLSAgZWxzZQorICBlbHNlIGlmICggaWNs aWVudCA9PSBLU19DTElFTlRfQVNQRUxMICkKICAgICBnZXRBdmFpbERpY3RzQXNwZWxsKCk7Cisg IGVsc2UKKyAgICBnZXRBdmFpbERpY3RzSHVuc3BlbGwoKTsKIAogICAvLyBzZWxlY3QgdGhlIHVz ZWQgZGljdGlvbmFyeSBpbiB0aGUgbGlzdAogICBpbnQgd2hpY2hlbGVtZW50PS0xOwpAQCAtNjA2 LDYgKzYxMiw2MyBAQAogICB9CiB9CiAKK3ZvaWQgSzNTcGVsbENvbmZpZzo6Z2V0QXZhaWxEaWN0 c0h1bnNwZWxsICgpIHsKKworICBsYW5nZm5hbWVzLmNsZWFyKCk7CisgIGRpY3Rjb21iby0+Y2xl YXIoKTsKKyAgbGFuZ2ZuYW1lcy5hcHBlbmQoIiIpOyAvLyBEZWZhdWx0CisgIGRpY3Rjb21iby0+ YWRkSXRlbSggaTE4bmMoIkBpdGVtIFNwZWxsaW5nIGRpY3Rpb25hcnkiLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICI8YXBwbGljYXRpb24+SHVuc3BlbGw8L2FwcGxpY2F0aW9uPiBEZWZh dWx0IikgKTsKKworICAvLyBkaWN0aW9uYXJ5IHBhdGgKKyAgUUZpbGVJbmZvIGRpciAoIi91c3Iv c2hhcmUvbXlzcGVsbCIpOworICBpZiAoIWRpci5leGlzdHMoKSB8fCAhZGlyLmlzRGlyKCkpCisg ICAgZGlyLnNldEZpbGUgKCIvdXNyL3NoYXJlL2h1bnNwZWxsIik7CisgIGlmICghZGlyLmV4aXN0 cygpIHx8ICFkaXIuaXNEaXIoKSkgcmV0dXJuOworCisgIGtEZWJ1Zyg3NTApIDw8ICJLM1NwZWxs Q29uZmlnOjpnZXRBdmFpbERpY3RzSHVuc3BlbGwgIgorCSAgICAgICA8PCBkaXIuZmlsZVBhdGgo KSA8PCAiICIgPDwgZGlyLnBhdGgoKSA8PCBlbmRsOworCisgIGNvbnN0IFFEaXIgdGhlZGlyIChk aXIuZmlsZVBhdGgoKSwiKi5kaWMiKTsKKyAgY29uc3QgUVN0cmluZ0xpc3QgZW50cnlMaXN0ID0g dGhlZGlyLmVudHJ5TGlzdCgpOworCisgIGtEZWJ1Zyg3NTApIDw8ICJLM1NwZWxsQ29uZmlnIiA8 PCB0aGVkaXIucGF0aCgpIDw8ICJcbiI7CisgIGtEZWJ1Zyg3NTApIDw8ICJlbnRyeUxpc3QoKS5j b3VudCgpPSIKKwkgICAgICAgPDwgZW50cnlMaXN0LmNvdW50KCkgPDwgZW5kbDsKKworICBRU3Ry aW5nTGlzdDo6Y29uc3RfaXRlcmF0b3IgZW50cnlMaXN0SXRyID0gZW50cnlMaXN0LmNvbnN0QmVn aW4oKTsKKyAgY29uc3QgUVN0cmluZ0xpc3Q6OmNvbnN0X2l0ZXJhdG9yIGVudHJ5TGlzdEVuZCA9 IGVudHJ5TGlzdC5jb25zdEVuZCgpOworCisgIGZvciAoIDsgZW50cnlMaXN0SXRyICE9IGVudHJ5 TGlzdEVuZDsgKytlbnRyeUxpc3RJdHIpCisgIHsKKyAgICBRU3RyaW5nIGZuYW1lLCBsbmFtZSwg aG5hbWU7CisgICAgZm5hbWUgPSAqZW50cnlMaXN0SXRyOworCisgICAgLy8gcmVtb3ZlIC5kaWMK KyAgICBpZiAoZm5hbWUuZW5kc1dpdGgoIi5kaWMiKSkgZm5hbWUucmVtb3ZlIChmbmFtZS5sZW5n dGgoKS00LDQpOworCisgICAgaWYgKGludGVycHJldCAoZm5hbWUsIGxuYW1lLCBobmFtZSkgJiYg bGFuZ2ZuYW1lcy5maXJzdCgpLmlzRW1wdHkoKSkKKyAgICB7IC8vIFRoaXMgb25lIGlzIHRoZSBL REUgZGVmYXVsdCBsYW5ndWFnZQorICAgICAgLy8gc28gcGxhY2UgaXQgZmlyc3QgaW4gdGhlIGxp c3RzIChvdmVyd3JpdGUgIkRlZmF1bHQiKQorCisgICAgICBsYW5nZm5hbWVzLnJlbW92ZUZpcnN0 KCk7CisgICAgICBsYW5nZm5hbWVzLnByZXBlbmQgKCBmbmFtZSApOworCisgICAgICBobmFtZT1p MThuYygiQGl0ZW0gU3BlbGxpbmcgZGljdGlvbmFyeTogJTEgZGljdGlvbmFyeSBuYW1lLCAlMiBm aWxlIG5hbWUiLAorICAgICAgICAgICAgICAgICAgIkRlZmF1bHQgLSAlMSBbJTJdIiwgaG5hbWUs IGZuYW1lKTsKKworICAgICAgZGljdGNvbWJvLT5zZXRJdGVtVGV4dCAoMCxobmFtZSk7CisgICAg fQorICAgIGVsc2UKKyAgICB7CisgICAgICBsYW5nZm5hbWVzLmFwcGVuZCAoZm5hbWUpOworICAg ICAgaG5hbWU9aG5hbWUrIiBbIitmbmFtZSsnXSc7CisKKyAgICAgIGRpY3Rjb21iby0+YWRkSXRl bSAoaG5hbWUpOworICAgIH0KKyAgfQorfQorCiB2b2lkCiBLM1NwZWxsQ29uZmlnOjpmaWxsRGlj dHMoIFFDb21ib0JveCogYm94LCBRU3RyaW5nTGlzdCogZGljdGlvbmFyaWVzICkKIHsKQEAgLTY4 NSw4ICs3NDgsNyBAQAogICAgICAgYm94LT5hZGRJdGVtKCBpMThuYygiQGl0ZW0gU3BlbGxpbmcg ZGljdGlvbmFyeSIsICJUdXJraXNoIikgKTsKICAgICAgIGxhbmdmbmFtZXMuYXBwZW5kKCIiKTsK ICAgICAgIHNDaGFuZ2VFbmNvZGluZyggS1NfRV9VVEY4ICk7Ci0gICAgfQotICAgIGVsc2Ugewor ICAgIH0gZWxzZSBpZiAoIGljbGllbnQgPT0gS1NfQ0xJRU5UX0FTUEVMTCApIHsKICAgICAgIGJv eC0+Y2xlYXIoKTsKICAgICAgIGxhbmdmbmFtZXMuYXBwZW5kKCIiKTsgLy8gRGVmYXVsdAogICAg ICAgYm94LT5hZGRJdGVtIChpMThuYygiQGl0ZW0gU3BlbGxpbmcgZGljdGlvbmFyeSIsCkBAIC03 NjYsNiArODI4LDU5IEBACiAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICB9CisgICAgfSBl bHNlIHsKKyAgICAgIGJveC0+Y2xlYXIoKTsKKyAgICAgIGxhbmdmbmFtZXMuYXBwZW5kKCIiKTsg Ly8gRGVmYXVsdAorICAgICAgYm94LT5hZGRJdGVtKCBpMThuYygiQGl0ZW0gU3BlbGxpbmcgZGlj dGlvbmFyeSIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICI8YXBwbGljYXRpb24+SHVuc3Bl bGw8L2FwcGxpY2F0aW9uPiBEZWZhdWx0IikgKTsKKworICAgICAgLy8gZGljdGlvbmFyeSBwYXRo CisgICAgICBRRmlsZUluZm8gZGlyICgiL3Vzci9zaGFyZS9teXNwZWxsIik7CisgICAgICBpZiAo IWRpci5leGlzdHMoKSB8fCAhZGlyLmlzRGlyKCkpCisgICAgICAgIGRpci5zZXRGaWxlICgiL3Vz ci9zaGFyZS9odW5zcGVsbCIpOworICAgICAgaWYgKCFkaXIuZXhpc3RzKCkgfHwgIWRpci5pc0Rp cigpKSByZXR1cm47CisKKyAgICAgIGtEZWJ1Zyg3NTApIDw8ICJLM1NwZWxsQ29uZmlnOjpnZXRB dmFpbERpY3RzSHVuc3BlbGwgIgorICAgICAgICAgICAgICAgICAgIDw8IGRpci5maWxlUGF0aCgp IDw8ICIgIiA8PCBkaXIucGF0aCgpIDw8IGVuZGw7CisKKyAgICAgIGNvbnN0IFFEaXIgdGhlZGly IChkaXIuZmlsZVBhdGgoKSwiKi5kaWMiKTsKKyAgICAgIGNvbnN0IFFTdHJpbmdMaXN0IGVudHJ5 TGlzdCA9IHRoZWRpci5lbnRyeUxpc3QoKTsKKworICAgICAga0RlYnVnKDc1MCkgPDwgIkszU3Bl bGxDb25maWciIDw8IHRoZWRpci5wYXRoKCkgPDwgIlxuIjsKKyAgICAgIGtEZWJ1Zyg3NTApIDw8 ICJlbnRyeUxpc3QoKS5jb3VudCgpPSIKKyAgICAgICAgICAgICAgICAgICA8PCBlbnRyeUxpc3Qu Y291bnQoKSA8PCBlbmRsOworCisgICAgICBRU3RyaW5nTGlzdDo6Y29uc3RfaXRlcmF0b3IgZW50 cnlMaXN0SXRyID0gZW50cnlMaXN0LmNvbnN0QmVnaW4oKTsKKyAgICAgIGNvbnN0IFFTdHJpbmdM aXN0Ojpjb25zdF9pdGVyYXRvciBlbnRyeUxpc3RFbmQgPSBlbnRyeUxpc3QuY29uc3RFbmQoKTsK KworICAgICAgZm9yICggOyBlbnRyeUxpc3RJdHIgIT0gZW50cnlMaXN0RW5kOyArK2VudHJ5TGlz dEl0cikKKyAgICAgIHsKKyAgICAgICAgUVN0cmluZyBmbmFtZSwgbG5hbWUsIGhuYW1lOworICAg ICAgICBmbmFtZSA9ICplbnRyeUxpc3RJdHI7CisKKyAgICAgICAgLy8gcmVtb3ZlIC5kaWMKKyAg ICAgICAgaWYgKGZuYW1lLmVuZHNXaXRoKCIuZGljIikpIGZuYW1lLnJlbW92ZSAoZm5hbWUubGVu Z3RoKCktNCw0KTsKKworICAgICAgICBpZiAoaW50ZXJwcmV0IChmbmFtZSwgbG5hbWUsIGhuYW1l KSAmJiBsYW5nZm5hbWVzLmZpcnN0KCkuaXNFbXB0eSgpKQorICAgICAgICB7IC8vIFRoaXMgb25l IGlzIHRoZSBLREUgZGVmYXVsdCBsYW5ndWFnZQorICAgICAgICAgIC8vIHNvIHBsYWNlIGl0IGZp cnN0IGluIHRoZSBsaXN0cyAob3ZlcndyaXRlICJEZWZhdWx0IikKKworICAgICAgICAgIGxhbmdm bmFtZXMuZXJhc2UgKCBsYW5nZm5hbWVzLmJlZ2luKCkgKTsKKyAgICAgICAgICBsYW5nZm5hbWVz LnByZXBlbmQgKCBmbmFtZSApOworCisgICAgICAgICAgaG5hbWU9aTE4bmMoIkBpdGVtIFNwZWxs aW5nIGRpY3Rpb25hcnk6ICUxIGRpY3Rpb25hcnkgbmFtZSwgJTIgZmlsZSBuYW1lIiwKKyAgICAg ICAgICAgICAgICAgICAgICAiRGVmYXVsdCAtICUxIFslMl0iLCBobmFtZSwgZm5hbWUpOworCisg ICAgICAgICAgYm94LT5zZXRJdGVtVGV4dCAoMCxobmFtZSk7CisgICAgICAgIH0KKyAgICAgICAg ZWxzZQorICAgICAgICB7CisgICAgICAgICAgbGFuZ2ZuYW1lcy5hcHBlbmQgKGZuYW1lKTsKKyAg ICAgICAgICBobmFtZT1obmFtZSsiIFsiK2ZuYW1lKyddJzsKKworICAgICAgICAgIGJveC0+YWRk SXRlbSAoaG5hbWUpOworICAgICAgICB9CisgICAgICB9CiAgICAgfQogICAgIGludCB3aGljaGVs ZW1lbnQgPSBsYW5nZm5hbWVzLmluZGV4T2YocXNkaWN0KTsKICAgICBpZiAoIHdoaWNoZWxlbWVu dCA+PSAwICkgewpkaWZmIC11ciBrZGVsaWJzLTQuMC4wL2tkZTNzdXBwb3J0L2tkZXVpL2szc2Nv bmZpZy5oIGtkZWxpYnMtNC4wLjAtazNzcGVsbC1odW5zcGVsbC9rZGUzc3VwcG9ydC9rZGV1aS9r M3Njb25maWcuaAotLS0ga2RlbGlicy00LjAuMC9rZGUzc3VwcG9ydC9rZGV1aS9rM3Njb25maWcu aAkyMDA4LTAxLTA1IDAwOjU5OjQxLjAwMDAwMDAwMCArMDEwMAorKysga2RlbGlicy00LjAuMC1r M3NwZWxsLWh1bnNwZWxsL2tkZTNzdXBwb3J0L2tkZXVpL2szc2NvbmZpZy5oCTIwMDgtMDEtMTkg MTY6MjU6NDMuMDAwMDAwMDAwICswMTAwCkBAIC0xLDUgKzEsNiBAQAogLyogVGhpcyBmaWxlIGlz IHBhcnQgb2YgdGhlIEtERSBsaWJyYXJpZXMKICAgIENvcHlyaWdodCAoQykgMTk5NyBEYXZpZCBT d2VldCA8ZHN3ZWV0QGtkZS5vcmc+CisgICBDb3B5cmlnaHQgKEMpIDIwMDctMjAwOCBLZXZpbiBL b2ZsZXIgPEtldmluQHRpZ2NjLnRpY2FsYy5vcmc+CiAKICAgIFRoaXMgbGlicmFyeSBpcyBmcmVl IHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICAgIG1vZGlmeSBpdCB1 bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCkBAIC02MCw3 ICs2MSw4IEBACiAgIEtTX0NMSUVOVF9JU1BFTEw9MCwKICAgS1NfQ0xJRU5UX0FTUEVMTD0xLAog ICBLU19DTElFTlRfSFNQRUxMPTIsCi0gIEtTX0NMSUVOVF9aRU1CRVJFSz0zCisgIEtTX0NMSUVO VF9aRU1CRVJFSz0zLAorICBLU19DTElFTlRfSFVOU1BFTEw9NAogfTsKIAogLyoqCkBAIC0yODcs NiArMjg5LDcgQEAKICAgICBLM1NwZWxsQ29uZmlnUHJpdmF0ZSAqY29uc3QgZDsKICAgICB2b2lk IGdldEF2YWlsRGljdHNJc3BlbGwoKTsKICAgICB2b2lkIGdldEF2YWlsRGljdHNBc3BlbGwoKTsK KyAgICB2b2lkIGdldEF2YWlsRGljdHNIdW5zcGVsbCgpOwogfTsKIAogI2VuZGlmIC8vIEtERUxJ QlNfS1NDT05GSUdfSApkaWZmIC11ciBrZGVsaWJzLTQuMC4wL2tkZTNzdXBwb3J0L2tkZXVpL2sz c3BlbGwuY3BwIGtkZWxpYnMtNC4wLjAtazNzcGVsbC1odW5zcGVsbC9rZGUzc3VwcG9ydC9rZGV1 aS9rM3NwZWxsLmNwcAotLS0ga2RlbGlicy00LjAuMC9rZGUzc3VwcG9ydC9rZGV1aS9rM3NwZWxs LmNwcAkyMDA4LTAxLTA1IDAwOjU5OjQxLjAwMDAwMDAwMCArMDEwMAorKysga2RlbGlicy00LjAu MC1rM3NwZWxsLWh1bnNwZWxsL2tkZTNzdXBwb3J0L2tkZXVpL2szc3BlbGwuY3BwCTIwMDgtMDEt MTkgMTY6NDQ6MDAuMDAwMDAwMDAwICswMTAwCkBAIC0yLDYgKzIsNyBAQAogICAgQ29weXJpZ2h0 IChDKSAxOTk3IERhdmlkIFN3ZWV0IDxkc3dlZXRAa2RlLm9yZz4KICAgIENvcHlyaWdodCAoQykg MjAwMC0yMDAxIFdvbGZyYW0gRGllc3RlbCA8d29sZnJhbUBzdGVsb2ouZGU+CiAgICBDb3B5cmln aHQgKEMpIDIwMDMgWmFjayBSdXNpbiA8emFja0BrZGUub3JnPgorICAgQ29weXJpZ2h0IChDKSAy MDA3LTIwMDggS2V2aW4gS29mbGVyIDxLZXZpbkB0aWdjYy50aWNhbGMub3JnPgogCiAgICBUaGlz IGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29y CiAgICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFs IFB1YmxpYwpAQCAtMjE4LDkgKzIxOSwxNCBAQAogICAgICpwcm9jIDw8ICJ6cHNwZWxsIjsKICAg ICBrRGVidWcoNzUwKSA8PCAiVXNpbmcgemVtYmVyZWsoenBzcGVsbCkiOwogICAgIGJyZWFrOwor ICBjYXNlIEtTX0NMSUVOVF9IVU5TUEVMTDoKKyAgICAqcHJvYyA8PCAiaHVuc3BlbGwiOworICAg IGtEZWJ1Zyg3NTApIDw8ICJVc2luZyBodW5zcGVsbCI7CisgICAgYnJlYWs7CiAgIH0KIAotICBp ZiAoIGtzY29uZmlnLT5jbGllbnQoKSA9PSBLU19DTElFTlRfSVNQRUxMIHx8IGtzY29uZmlnLT5j bGllbnQoKSA9PSBLU19DTElFTlRfQVNQRUxMICkKKyAgLy8gSHVuc3BlbGwgZG9lc24ndCBuZWVk IGFsbCBvZiB0aGVzZSBvcHRpb25zLCBidXQgaXQnbGwgaWdub3JlIHRob3NlIGl0IGRvZXNuJ3Qg dW5kZXJzdGFuZC4KKyAgaWYgKCBrc2NvbmZpZy0+Y2xpZW50KCkgPT0gS1NfQ0xJRU5UX0lTUEVM TCB8fCBrc2NvbmZpZy0+Y2xpZW50KCkgPT0gS1NfQ0xJRU5UX0FTUEVMTCB8fCBrc2NvbmZpZy0+ Y2xpZW50KCkgPT0gS1NfQ0xJRU5UX0hVTlNQRUxMICkKICAgewogICAgICpwcm9jIDw8ICItYSIg PDwgIi1TIjsKIApAQCAtMjM4LDggKzI0NCw4IEBACiAgICAgICAqcHJvYyA8PCAiLXQiOwogICAg ICAgYnJlYWs7CiAgICAgY2FzZSBOcm9mZjoKLSAgICAgIC8vb25seSBpc3BlbGwgc3VwcG9ydHMK LSAgICAgIGlmICgga3Njb25maWctPmNsaWVudCgpID09IEtTX0NMSUVOVF9JU1BFTEwgKQorICAg ICAgLy9vbmx5IGlzcGVsbCBhbmQgaHVuc3BlbGwgc3VwcG9ydAorICAgICAgaWYgKCBrc2NvbmZp Zy0+Y2xpZW50KCkgPT0gS1NfQ0xJRU5UX0lTUEVMTCB8fCBrc2NvbmZpZy0+Y2xpZW50KCkgPT0g S1NfQ0xJRU5UX0hVTlNQRUxMICkKICAgICAgICAgKnByb2MgPDwgIi1uIjsKICAgICAgIGJyZWFr OwogICAgIGNhc2UgVGV4dDoKQEAgLTI3Niw3ICsyODIsNjAgQEAKICAgLy8gb3B0aW9uLCBzbyBr M3NwZWxsIHRyaWVzIGFnYWluIHdpdGhvdXQgaXQuICBUaGF0J3Mgd2h5IGFzICdwcyAtYXgnCiAg IC8vIHNob3dzICJpc3BlbGwgLWEgLVMgLi4uIiB3aXRob3UgdGhlICItVGxhdGluMiIgb3B0aW9u LgogCi0gICAgaWYgKCB0cnlzdGFydDwxICkgeworICAgIGlmICgga3Njb25maWctPmNsaWVudCgp ID09IEtTX0NMSUVOVF9IVU5TUEVMTCAmJiB0cnlzdGFydDwxICkgeworICAgICAgLy8gTm90ZTog VGhpcyBzZXRzIEkvTyBlbmNvZGluZy4gSHVuc3BlbGwgY29ycmVjdGx5IGhhbmRsZXMgZGljdGlv bmFyeSBlbmNvZGluZyAhPSBJL08gZW5jb2RpbmcuCisgICAgICAvLyBJdCB3aWxsIGJlIGZhc3Rl ciBpZiB0aGUgSS9PIGVuY29kaW5nIG1hdGNoZXMgdGhlIGRpY3Rpb25hcnkgZW5jb2RpbmcsIGJ1 dCB1c2luZyBVVEYtOCBpcyBhbHdheXMgc2FmZS4KKyAgICAgIHN3aXRjaCAoIGtzY29uZmlnLT5l bmNvZGluZygpICkKKyAgICAgIHsKKyAgICAgIGNhc2UgS1NfRV9MQVRJTjE6CisJKnByb2MgPDwg Ii1pIiA8PCAiSVNPLTg4NTktMSI7CisJYnJlYWs7CisgICAgICBjYXNlIEtTX0VfTEFUSU4yOgor CSpwcm9jIDw8ICItaSIgPDwgIklTTy04ODU5LTIiOworCWJyZWFrOworICAgICAgY2FzZSBLU19F X0xBVElOMzoKKwkqcHJvYyA8PCAiLWkiIDw8ICJJU08tODg1OS0zIjsKKyAgICAgICAgYnJlYWs7 CisgICAgICBjYXNlIEtTX0VfTEFUSU40OgorCSpwcm9jIDw8ICItaSIgPDwgIklTTy04ODU5LTQi OworICAgICAgICBicmVhazsKKyAgICAgIGNhc2UgS1NfRV9MQVRJTjU6CisJKnByb2MgPDwgIi1p IiA8PCAiSVNPLTg4NTktNSI7CisgICAgICAgIGJyZWFrOworICAgICAgY2FzZSBLU19FX0xBVElO NzoKKwkqcHJvYyA8PCAiLWkiIDw8ICJJU08tODg1OS03IjsKKyAgICAgICAgYnJlYWs7CisgICAg ICBjYXNlIEtTX0VfTEFUSU44OgorCSpwcm9jIDw8ICItaSIgPDwgIklTTy04ODU5LTgiOworICAg ICAgICBicmVhazsKKyAgICAgIGNhc2UgS1NfRV9MQVRJTjk6CisJKnByb2MgPDwgIi1pIiA8PCAi SVNPLTg4NTktOSI7CisgICAgICAgIGJyZWFrOworICAgICAgY2FzZSBLU19FX0xBVElOMTM6CisJ KnByb2MgPDwgIi1pIiA8PCAiSVNPLTg4NTktMTMiOworICAgICAgICBicmVhazsKKyAgICAgIGNh c2UgS1NfRV9MQVRJTjE1OgorCSpwcm9jIDw8ICItaSIgPDwgIklTTy04ODU5LTE1IjsKKyAgICAg ICAgYnJlYWs7CisgICAgICBjYXNlIEtTX0VfVVRGODoKKwkqcHJvYyA8PCAiLWkiIDw8ICJVVEYt OCI7CisgICAgICAgIGJyZWFrOworICAgICAgY2FzZSBLU19FX0tPSThSOgorCSpwcm9jIDw8ICIt aSIgPDwgIktPSTgtUiI7CisgICAgICAgIGJyZWFrOworICAgICAgY2FzZSBLU19FX0tPSThVOgor CSpwcm9jIDw8ICItaSIgPDwgIktPSTgtVSI7CisgICAgICAgIGJyZWFrOworICAgICAgY2FzZSBL U19FX0NQMTI1MToKKwkqcHJvYyA8PCAiLWkiIDw8ICJDUDEyNTEiOworICAgICAgICBicmVhazsK KyAgICAgIGNhc2UgS1NfRV9DUDEyNTU6CisJKnByb2MgPDwgIi1pIiA8PCAiQ1AxMjU1IjsKKyAg ICAgICAgYnJlYWs7CisgICAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsKKyAgICAgIH0KKyAg ICB9IGVsc2UgaWYgKCB0cnlzdGFydDwxICkgewogICAgICAgc3dpdGNoICgga3Njb25maWctPmVu Y29kaW5nKCkgKQogICAgICAgewogICAgICAgY2FzZSBLU19FX0xBVElOMToK