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: Adam Williamson To: git-commits@fedoraproject.org Subject: [rpms/ibus] autotool: Backport PR #2195 to fix ibus with GNOME 3.36.0 Date: Sun, 31 May 2026 02:07:22 GMT Message-ID: <178019324211.1.17150170217810420947.rpms-ibus-8fae345fb88f@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: 8fae345fb88f7134dc03c6b66413a7b44d913731 QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvaWJ1cwpCcmFuY2gg OiBhdXRvdG9vbApDb21taXQgOiA4ZmFlMzQ1ZmI4OGY3MTM0ZGMwM2M2YjY2NDEzYTdiNDRkOTEz NzMxCkF1dGhvciA6IEFkYW0gV2lsbGlhbXNvbiA8YXdpbGxpYW1AcmVkaGF0LmNvbT4KRGF0ZSAg IDogMjAyMC0wMy0xMVQxMTo0MjoxOS0wNzowMApTdGF0cyAgOiArNzYvLTEgaW4gMiBmaWxlKHMp ClVSTCAgICA6IGh0dHBzOi8vc3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvaWJ1cy9jLzhmYWUz NDVmYjg4ZjcxMzRkYzAzYzZiNjY0MTNhN2I0NGQ5MTM3MzE/YnJhbmNoPWF1dG90b29sCgpMb2c6 CkJhY2twb3J0IFBSICMyMTk1IHRvIGZpeCBpYnVzIHdpdGggR05PTUUgMy4zNi4wCgotLS0KZGlm ZiAtLWdpdCBhLzIxOTUucGF0Y2ggYi8yMTk1LnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAuLmE1Njg4MmUKLS0tIC9kZXYvbnVsbAorKysgYi8yMTk1LnBhdGNoCkBAIC0w LDAgKzEsNjggQEAKK0Zyb20gMWJlZDc3YWQxOThiYzZhZDcxODQ2NzRjNTEwNDI1MDM5MTQzZmFj NyBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IENhcmxvcyBHYXJuYWNobyA8Y2FybG9z Z0Bnbm9tZS5vcmc+CitEYXRlOiBXZWQsIDExIE1hciAyMDIwIDE3OjA4OjM3ICswMTAwCitTdWJq ZWN0OiBbUEFUQ0hdIHNyYzogVXNlIFdBWUxBTkRfRElTUExBWSBvbiBXYXlsYW5kIHNlc3Npb25z IHRvIG1ha2UgdXAgSUJ1cworIHNvY2tldCBuYW1lCisKK0luIFdheWxhbmQgc2Vzc2lvbnMsIEdO T01FIFNoZWxsIDMuMzYgaXMgbGV2ZXJhZ2luZyAyIFgxMSBEaXNwbGF5Citjb25uZWN0aW9ucyBz byBvbmUgaXMgdXNlZCB0byBzZXQgdXAgYWxsIHNlcnZpY2VzIGZvciBhICJYMTEgc2Vzc2lvbiIK K2JlZm9yZSB1c2VyIGFwcGxpY2F0aW9ucyBjb25uZWN0ZWQgdG8gdGhlIG90aGVyIGRpc3BsYXkg bWlnaHQgcmVxdWlyZSBpdC4KK1RoaXMgYWxsb3dzIHNlYW1sZXNzbHkgc3RhcnRpbmcgWHdheWxh bmQgb24gZGVtYW5kIHRvIFgxMSB1c2VyIGFwcGxpY2F0aW9ucy4KKworSUJ1cyBoZXJlIGJlbG9u Z3MgdG8gdGhlIGZpcnN0IGRlc2NyaWJlZCBjb25uZWN0aW9uLCBpdCBpcyBzdGFydGVkCitleHBs aWNpdGx5IG9uIHRoYXQgZGlzcGxheSBieSBHTk9NRSBTaGVsbCBhcyBpdCBpcyBuZWNlc3Nhcnkg dG8gc2V0IHVwCitpYnVzLXgxMSBiZWZvcmUgYW55IG90aGVyIFgxMSBjbGllbnQgbWlnaHQgd2Fu dCB0byB1c2UgaXQuCisKK0hvd2V2ZXIgdGhlIHVzZSBvZiB0aGlzICJzZWNvbmRhcnkiIGRpc3Bs YXkgcmVzdWx0cyBpbiBJQnVzIGRhZW1vbiBsZWZ0Cit1bmFibGUgdG8gdGFsayB0byBhcHBsaWNh dGlvbnMsIGFzIHRoZSBzb2NrZXQgbmFtZSBpcyBkZXBlbmRlbnQgb24gdGhlCitESVNQTEFZIGVu dnZhciBhbmQgaWJ1cy9hcHBsaWNhdGlvbnMgZG9uJ3QgYWdyZWUgb24gaXRzIGNvbnRlbnQuCisK K0ZvciB3YXlsYW5kIHNlc3Npb25zLCBtYWtlIGl0IGxvb2sgZm9yIFdBWUxBTkRfRElTUExBWSwg YXMgdGhhdCdsbCBoYXZlCit0aGUgc2ltaWxhciAicGVyIHNlc3Npb24gYnVzIiBiZWhhdmlvciB0 aGF0IHRoaXMgc2VlbXMgdG8gbG9vayBhZnRlci4KKworUmVsYXRlZDogaHR0cHM6Ly9naXRsYWIu Z25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsL2lzc3Vlcy8yMzQxCistLS0KKyBzcmMvaWJ1c3No YXJlLmMgfCAxMSArKysrKysrKystLQorIDEgZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyks IDIgZGVsZXRpb25zKC0pCisKK2RpZmYgLS1naXQgYS9zcmMvaWJ1c3NoYXJlLmMgYi9zcmMvaWJ1 c3NoYXJlLmMKK2luZGV4IDBkNTBkM2Y1Yy4uYjhlNjQ1MGY2IDEwMDY0NAorLS0tIGEvc3JjL2li dXNzaGFyZS5jCisrKysgYi9zcmMvaWJ1c3NoYXJlLmMKK0BAIC0xMDAsNiArMTAwLDcgQEAgaWJ1 c19nZXRfc29ja2V0X3BhdGggKHZvaWQpCisgICAgICAgICBnY2hhciAqZGlzcGxheTsKKyAgICAg ICAgIGdjaGFyICpkaXNwbGF5bnVtYmVyID0gIjAiOworICAgICAgICAgLyogZ2NoYXIgKnNjcmVl bm51bWJlciA9ICIwIjsgKi8KKysgICAgICAgIGdib29sZWFuIGlzX3dheWxhbmQgPSBGQUxTRTsK KyAgICAgICAgIGdjaGFyICpwOworIAorICAgICAgICAgcGF0aCA9IGdfc3RyZHVwIChnX2dldGVu diAoIklCVVNfQUREUkVTU19GSUxFIikpOworQEAgLTEwOCwxMyArMTA5LDE3IEBAIGlidXNfZ2V0 X3NvY2tldF9wYXRoICh2b2lkKQorICAgICAgICAgfQorIAorICAgICAgICAgaWYgKF9kaXNwbGF5 ID09IE5VTEwpIHsKKy0gICAgICAgICAgICBkaXNwbGF5ID0gZ19zdHJkdXAgKGdfZ2V0ZW52ICgi RElTUExBWSIpKTsKKysgICAgICAgICAgICBkaXNwbGF5ID0gZ19zdHJkdXAgKGdfZ2V0ZW52ICgi V0FZTEFORF9ESVNQTEFZIikpOworKyAgICAgICAgICAgIGlmIChkaXNwbGF5KQorKyAgICAgICAg ICAgICAgICBpc193YXlsYW5kID0gVFJVRTsKKysgICAgICAgICAgICBlbHNlCisrICAgICAgICAg ICAgICAgIGRpc3BsYXkgPSBnX3N0cmR1cCAoZ19nZXRlbnYgKCJESVNQTEFZIikpOworICAgICAg ICAgfQorICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgZGlzcGxheSA9IGdfc3RyZHVwIChf ZGlzcGxheSk7CisgICAgICAgICB9CisgCistICAgICAgICBpZiAoZGlzcGxheSkgeworKyAgICAg ICAgaWYgKGRpc3BsYXkgJiYgIWlzX3dheWxhbmQpIHsKKyAgICAgICAgICAgICBwID0gZGlzcGxh eTsKKyAgICAgICAgICAgICBob3N0bmFtZSA9IGRpc3BsYXk7CisgICAgICAgICAgICAgZm9yICg7 ICpwICE9ICc6JyAmJiAqcCAhPSAnXDAnOyBwKyspOworQEAgLTEzMyw2ICsxMzgsOCBAQCBpYnVz X2dldF9zb2NrZXRfcGF0aCAodm9pZCkKKyAgICAgICAgICAgICAgICAgLyogRG8gbm90IHVzZSBz Y3JlZW5udW1iZXIKKyAgICAgICAgICAgICAgICAgIHNjcmVlbm51bWJlciA9IHA7ICovCisgICAg ICAgICAgICAgfQorKyAgICAgICAgfSBlbHNlIGlmIChkaXNwbGF5KSB7CisrICAgICAgICAgICAg ZGlzcGxheW51bWJlciA9IGRpc3BsYXk7CisgICAgICAgICB9CisgCisgICAgICAgICBpZiAoaG9z dG5hbWVbMF0gPT0gJ1wwJykKCmRpZmYgLS1naXQgYS9pYnVzLnNwZWMgYi9pYnVzLnNwZWMKaW5k ZXggMmZhY2EwNy4uNDk5OGUzNyAxMDA2NDQKLS0tIGEvaWJ1cy5zcGVjCisrKyBiL2lidXMuc3Bl YwpAQCAtMzUsNyArMzUsNyBAQAogCiBOYW1lOiAgICAgICAgICAgaWJ1cwogVmVyc2lvbjogICAg ICAgIDEuNS4yMgotUmVsZWFzZTogICAgICAgIDIlez9kaXN0fQorUmVsZWFzZTogICAgICAgIDMl ez9kaXN0fQogU3VtbWFyeTogICAgICAgIEludGVsbGlnZW50IElucHV0IEJ1cyBmb3IgTGludXgg T1MKIExpY2Vuc2U6ICAgICAgICBMR1BMdjIrCiBVUkw6ICAgICAgICAgICAgaHR0cHM6Ly9naXRo dWIuY29tL2lidXMvJW5hbWUvd2lraQpAQCAtNDUsNiArNDUsMTAgQEAgU291cmNlMjogICAgICAg ICV7bmFtZX0uY29uZi41CiAjIFBhdGNoMDogICAgICAgICAlJXtuYW1lfS1IRUFELnBhdGNoCiAj IFVuZGVyIHRlc3RpbmcgIzEzNDkxNDggIzEzODUzNDkgIzEzNTAyOTEgIzE0MDY2OTkgIzE0MzIy NTIgIzE2MDE1NzcKIFBhdGNoMTogICAgICAgICAle25hbWV9LTEzODUzNDktc2Vndi1idXMtcHJv eHkucGF0Y2gKKyMgRml4IGRpc3BsYXkgc2VsZWN0aW9uIG9uIEdOT01FIDMuMzYuMAorIyBodHRw czovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvaXNzdWVzLzIzNDEKKyMgaHR0 cHM6Ly9naXRodWIuY29tL2lidXMvaWJ1cy9wdWxsLzIxOTUKK1BhdGNoMjogICAgICAgICAyMTk1 LnBhdGNoCiAKIEJ1aWxkUmVxdWlyZXM6ICBnZXR0ZXh0LWRldmVsCiBCdWlsZFJlcXVpcmVzOiAg bGlidG9vbApAQCAtNDYwLDYgKzQ2NCw5IEBAIGRjb25mIHVwZGF0ZSB8fCA6CiAle19kYXRhZGly fS9pbnN0YWxsZWQtdGVzdHMvaWJ1cwogCiAlY2hhbmdlbG9nCisqIFdlZCBNYXIgMTEgMjAyMCBB ZGFtIFdpbGxpYW1zb24gPGF3aWxsaWFtQHJlZGhhdC5jb20+IC0gMS41LjIyLTMKKy0gQmFja3Bv cnQgUFIgIzIxOTUgdG8gZml4IGlidXMgd2l0aCBHTk9NRSAzLjM2LjAKKwogKiBUdWUgRmViIDI1 IDIwMjAgVGFrYW8gRnVqaXdhcmEgPHRmdWppd2FyQHJlZGhhdC5jb20+IC0gMS41LjIyLTIKIC0g QnVnIDE4MDU2MzQgLSBBZGQgYSBjb25kaXRpb25hbCByZXF1aXJlcyBpYnVzLWd0azIgd2l0aCBn dGsyCiAK