From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Takao Fujiwara To: git-commits@fedoraproject.org Subject: [rpms/ibus] autotool: Fixed Bug 1554714 - improve order of unicode matches Date: Sun, 31 May 2026 02:06:49 GMT Message-ID: <178019320943.1.18198956180924729723.rpms-ibus-e4d7f1ede0ce@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: e4d7f1ede0cee7d8f142a14e9bac3f5a1125ad3e QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvaWJ1cwpCcmFuY2gg OiBhdXRvdG9vbApDb21taXQgOiBlNGQ3ZjFlZGUwY2VlN2Q4ZjE0MmExNGU5YmFjM2Y1YTExMjVh ZDNlCkF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgpEYXRlICAg OiAyMDE4LTAzLTMwVDEyOjUyOjMwKzA5OjAwClN0YXRzICA6ICs4Ni8tMSBpbiAyIGZpbGUocykK VVJMICAgIDogaHR0cHM6Ly9zcmMuZmVkb3JhcHJvamVjdC5vcmcvcnBtcy9pYnVzL2MvZTRkN2Yx ZWRlMGNlZTdkOGYxNDJhMTRlOWJhYzNmNWExMTI1YWQzZT9icmFuY2g9YXV0b3Rvb2wKCkxvZzoK Rml4ZWQgQnVnIDE1NTQ3MTQgLSBpbXByb3ZlIG9yZGVyIG9mIHVuaWNvZGUgbWF0Y2hlcwoKLS0t CmRpZmYgLS1naXQgYS9pYnVzLUhFQUQucGF0Y2ggYi9pYnVzLUhFQUQucGF0Y2gKaW5kZXggYjcy OTlkZi4uODk1MzBjYSAxMDA2NDQKLS0tIGEvaWJ1cy1IRUFELnBhdGNoCisrKyBiL2lidXMtSEVB RC5wYXRjaApAQCAtNzIsMyArNzIsODUgQEAgaW5kZXggODcwN2U0MzIuLjI0MDI5NzAzIDEwMDY0 NAogLS0gCiAyLjE0LjMKIAorRnJvbSBiMTg0ODYxMzk2Mjc5ZDkwM2U2MmJmNmFhZDI3MWEyMjA1 YTc5ODMyIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogZnVqaXdhcmF0IDx0YWthby5m dWppd2FyYTFAZ21haWwuY29tPgorRGF0ZTogRnJpLCAzMCBNYXIgMjAxOCAxMjozMzo1OSArMDkw MAorU3ViamVjdDogW1BBVENIXSB1aS9ndGszOiBTb3J0IFVuaWNvZGUgY2FuZGlkYXRlcworCitC VUc9cmhieiMxNTU0NzE0CitSPVNoYXduLlAuSHVhbmdAZ21haWwuY29tCisKK1JldmlldyBVUkw6 IGh0dHBzOi8vY29kZXJldmlldy5hcHBzcG90LmNvbS8zMzk0MzAwNDMKKy0tLQorIHVpL2d0azMv ZW1vamllci52YWxhIHwgMjYgKysrKysrKysrKysrKysrKysrKysrKystLS0KKyAxIGZpbGUgY2hh bmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL3Vp L2d0azMvZW1vamllci52YWxhIGIvdWkvZ3RrMy9lbW9qaWVyLnZhbGEKK2luZGV4IDI0MDI5NzAz Li4wYzA4NjVmMSAxMDA2NDQKKy0tLSBhL3VpL2d0azMvZW1vamllci52YWxhCisrKysgYi91aS9n dGszL2Vtb2ppZXIudmFsYQorQEAgLTExNDQsOSArMTE0NCwxMSBAQCBwdWJsaWMgY2xhc3MgSUJ1 c0Vtb2ppZXIgOiBHdGsuQXBwbGljYXRpb25XaW5kb3cgeworICAgICBsb29rdXBfZW1vamlzX2Zy b21fYW5ub3RhdGlvbihzdHJpbmcgYW5ub3RhdGlvbikgeworICAgICAgICAgR0xpYi5TTGlzdDxz dHJpbmc+PyB0b3RhbF9lbW9qaXMgPSBudWxsOworICAgICAgICAgdW5vd25lZCBHTGliLlNMaXN0 PHN0cmluZz4/IHN1Yl9lbW9qaXMgPSBudWxsOworKyAgICAgICAgdW5vd25lZCBHTGliLlNMaXN0 PHVuaWNoYXI+PyBzdWJfZXhhY3RfdW5pY29kZXMgPSBudWxsOworICAgICAgICAgdW5vd25lZCBH TGliLlNMaXN0PHVuaWNoYXI+PyBzdWJfdW5pY29kZXMgPSBudWxsOworICAgICAgICAgaW50IGxl bmd0aCA9IGFubm90YXRpb24ubGVuZ3RoOworICAgICAgICAgaWYgKG1faGFzX3BhcnRpYWxfbWF0 Y2ggJiYgbGVuZ3RoID49IG1fcGFydGlhbF9tYXRjaF9sZW5ndGgpIHsKKysgICAgICAgICAgICBH TGliLlNMaXN0PHN0cmluZz4/IHNvcnRlZF9lbW9qaXMgPSBudWxsOworICAgICAgICAgICAgIGZv cmVhY2ggKHVub3duZWQgc3RyaW5nIGtleSBpbgorICAgICAgICAgICAgICAgICAgICAgIG1fYW5u b3RhdGlvbl90b19lbW9qaXNfZGljdC5nZXRfa2V5cygpKSB7CisgICAgICAgICAgICAgICAgIGlm IChrZXkubGVuZ3RoIDwgbGVuZ3RoKQorQEAgLTExNzMsMTYgKzExNzUsMjkgQEAgcHVibGljIGNs YXNzIElCdXNFbW9qaWVyIDogR3RrLkFwcGxpY2F0aW9uV2luZG93IHsKKyAgICAgICAgICAgICAg ICAgc3ViX2Vtb2ppcyA9IG1fYW5ub3RhdGlvbl90b19lbW9qaXNfZGljdC5sb29rdXAoa2V5KTsK KyAgICAgICAgICAgICAgICAgZm9yZWFjaCAodW5vd25lZCBzdHJpbmcgZW1vamkgaW4gc3ViX2Vt b2ppcykgeworICAgICAgICAgICAgICAgICAgICAgaWYgKHRvdGFsX2Vtb2ppcy5maW5kX2N1c3Rv bShlbW9qaSwgR0xpYi5zdHJjbXApID09IG51bGwpIHsKKy0gICAgICAgICAgICAgICAgICAgICAg ICB0b3RhbF9lbW9qaXMuYXBwZW5kKGVtb2ppKTsKKysgICAgICAgICAgICAgICAgICAgICAgICBz b3J0ZWRfZW1vamlzLmluc2VydF9zb3J0ZWQoZW1vamksIEdMaWIuc3RyY21wKTsKKyAgICAgICAg ICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgIH0KKysgICAg ICAgICAgICBmb3JlYWNoIChzdHJpbmcgZW1vamkgaW4gc29ydGVkX2Vtb2ppcykgeworKyAgICAg ICAgICAgICAgICBpZiAodG90YWxfZW1vamlzLmZpbmRfY3VzdG9tKGVtb2ppLCBHTGliLnN0cmNt cCkgPT0gbnVsbCkgeworKyAgICAgICAgICAgICAgICAgICAgdG90YWxfZW1vamlzLmFwcGVuZChl bW9qaSk7CisrICAgICAgICAgICAgICAgIH0KKysgICAgICAgICAgICB9CisgICAgICAgICB9IGVs c2UgeworICAgICAgICAgICAgIHN1Yl9lbW9qaXMgPSBtX2Fubm90YXRpb25fdG9fZW1vamlzX2Rp Y3QubG9va3VwKGFubm90YXRpb24pOworICAgICAgICAgICAgIGZvcmVhY2ggKHVub3duZWQgc3Ry aW5nIGVtb2ppIGluIHN1Yl9lbW9qaXMpCisgICAgICAgICAgICAgICAgIHRvdGFsX2Vtb2ppcy5h cHBlbmQoZW1vamkpOworICAgICAgICAgfQorKyAgICAgICAgc3ViX2V4YWN0X3VuaWNvZGVzID0g bV9uYW1lX3RvX3VuaWNvZGVzX2RpY3QubG9va3VwKGFubm90YXRpb24pOworKyAgICAgICAgZm9y ZWFjaCAodW5pY2hhciBjb2RlIGluIHN1Yl9leGFjdF91bmljb2RlcykgeworKyAgICAgICAgICAg IHN0cmluZyBjaCA9IGNvZGUudG9fc3RyaW5nKCk7CisrICAgICAgICAgICAgaWYgKHRvdGFsX2Vt b2ppcy5maW5kX2N1c3RvbShjaCwgR0xpYi5zdHJjbXApID09IG51bGwpIHsKKysgICAgICAgICAg ICAgICAgdG90YWxfZW1vamlzLmFwcGVuZChjaCk7CisrICAgICAgICAgICAgfQorKyAgICAgICAg fQorICAgICAgICAgaWYgKGxlbmd0aCA+PSBtX3BhcnRpYWxfbWF0Y2hfbGVuZ3RoKSB7CisrICAg ICAgICAgICAgR0xpYi5TTGlzdDxzdHJpbmc+PyBzb3J0ZWRfdW5pY29kZXMgPSBudWxsOworICAg ICAgICAgICAgIGZvcmVhY2ggKHVub3duZWQgc3RyaW5nIGtleSBpbiBtX25hbWVfdG9fdW5pY29k ZXNfZGljdC5nZXRfa2V5cygpKSB7CisgICAgICAgICAgICAgICAgIGJvb2wgbWF0Y2hlZCA9IGZh bHNlOworICAgICAgICAgICAgICAgICBpZiAoa2V5LmluZGV4X29mKGFubm90YXRpb24pID49IDAp CitAQCAtMTE5MiwxMSArMTIwNywxNiBAQCBwdWJsaWMgY2xhc3MgSUJ1c0Vtb2ppZXIgOiBHdGsu QXBwbGljYXRpb25XaW5kb3cgeworICAgICAgICAgICAgICAgICBzdWJfdW5pY29kZXMgPSBtX25h bWVfdG9fdW5pY29kZXNfZGljdC5sb29rdXAoa2V5KTsKKyAgICAgICAgICAgICAgICAgZm9yZWFj aCAodW5pY2hhciBjb2RlIGluIHN1Yl91bmljb2RlcykgeworICAgICAgICAgICAgICAgICAgICAg c3RyaW5nIGNoID0gY29kZS50b19zdHJpbmcoKTsKKy0gICAgICAgICAgICAgICAgICAgIGlmICh0 b3RhbF9lbW9qaXMuZmluZF9jdXN0b20oY2gsIEdMaWIuc3RyY21wKSA9PSBudWxsKSB7CistICAg ICAgICAgICAgICAgICAgICAgICAgdG90YWxfZW1vamlzLmFwcGVuZChjaCk7CisrICAgICAgICAg ICAgICAgICAgICBpZiAoc29ydGVkX3VuaWNvZGVzLmZpbmRfY3VzdG9tKGNoLCBHTGliLnN0cmNt cCkgPT0gbnVsbCkgeworKyAgICAgICAgICAgICAgICAgICAgICAgIHNvcnRlZF91bmljb2Rlcy5p bnNlcnRfc29ydGVkKGNoLCBHTGliLnN0cmNtcCk7CisgICAgICAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICB9CisrICAgICAgICAgICAgZm9yZWFjaCAo c3RyaW5nIGNoIGluIHNvcnRlZF91bmljb2RlcykgeworKyAgICAgICAgICAgICAgICBpZiAodG90 YWxfZW1vamlzLmZpbmRfY3VzdG9tKGNoLCBHTGliLnN0cmNtcCkgPT0gbnVsbCkgeworKyAgICAg ICAgICAgICAgICAgICAgdG90YWxfZW1vamlzLmFwcGVuZChjaCk7CisrICAgICAgICAgICAgICAg IH0KKysgICAgICAgICAgICB9CisgICAgICAgICB9CisgICAgICAgICByZXR1cm4gdG90YWxfZW1v amlzOworICAgICB9CistLSAKKzIuMTQuMworCgpkaWZmIC0tZ2l0IGEvaWJ1cy5zcGVjIGIvaWJ1 cy5zcGVjCmluZGV4IDllODM2MGEuLjQ4YTNjN2UgMTAwNjQ0Ci0tLSBhL2lidXMuc3BlYworKysg Yi9pYnVzLnNwZWMKQEAgLTMwLDcgKzMwLDcgQEAKIAogTmFtZTogICAgICAgICAgIGlidXMKIFZl cnNpb246ICAgICAgICAxLjUuMTgKLVJlbGVhc2U6ICAgICAgICAzJXs/ZGlzdH0KK1JlbGVhc2U6 ICAgICAgICA0JXs/ZGlzdH0KIFN1bW1hcnk6ICAgICAgICBJbnRlbGxpZ2VudCBJbnB1dCBCdXMg Zm9yIExpbnV4IE9TCiBMaWNlbnNlOiAgICAgICAgTEdQTHYyKwogR3JvdXA6ICAgICAgICAgIFN5 c3RlbSBFbnZpcm9ubWVudC9MaWJyYXJpZXMKQEAgLTQzMSw2ICs0MzEsOSBAQCBkY29uZiB1cGRh dGUgfHwgOgogJXtfZGF0YWRpcn0vZ3RrLWRvYy9odG1sLyoKIAogJWNoYW5nZWxvZworKiBGcmkg TWFyIDMwIDIwMTggVGFrYW8gRnVqaXdhcmEgPHRmdWppd2FyQHJlZGhhdC5jb20+IC0gMS41LjE4 LTQKKy0gRml4ZWQgQnVnIDE1NTQ3MTQgLSBpbXByb3ZlIG9yZGVyIG9mIHVuaWNvZGUgbWF0Y2hl cworCiAqIFRodSBNYXIgMTUgMjAxOCBUYWthbyBGdWppd2FyYSA8dGZ1aml3YXJAcmVkaGF0LmNv bT4gLSAxLjUuMTgtMwogLSBGaXhlZCBCdWcgMTU1NDgxMyAtIEVudGVyIGtleSBvbiBudW1wYWQg aW4gRW1vamllcgogCg==