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 font settings for GTK 3.22 Date: Sun, 31 May 2026 02:06:28 GMT Message-ID: <178019318826.1.4830550407923819933.rpms-ibus-042884aa82a3@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: 042884aa82a310d40af3dab37c379e3957273742 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg ICBDb21taXQgOiAwNDI4ODRhYTgyYTMxMGQ0MGFmM2RhYjM3YzM3OWUzOTU3MjczNzQyCiAgICAg ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg ICAgICAgICBEYXRlICAgOiAyMDE3LTAxLTExVDE1OjA0OjI1KzA5OjAwCiAgICAgICAgICAgIFN0 YXRzICA6ICsyNDIvLTEgaW4gMiBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6IGh0dHBzOi8v c3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvaWJ1cy9jLzA0Mjg4NGFhODJhMzEwZDQwYWYzZGFi MzdjMzc5ZTM5NTcyNzM3NDI/YnJhbmNoPWF1dG90b29sCgogICAgICAgICAgICBMb2c6CiAgICAg ICAgICAgIEZpeGVkIGZvbnQgc2V0dGluZ3MgZm9yIEdUSyAzLjIyCgotIHN1cHBvcnQgc2Nyb2xs IGV2ZW50IGluIGNhbmRpZGF0ZXMgcGFuZWwKLSBGaXhlZCBCdWcgMTQwMzk4NSAtIEVtb2ppIHR5 cGluZyBpcyBlbmFibGVkIGR1cmluZyBVbmljb2RlIHR5cGluZwotIEZpeGVkIEJ1ZyAxNDAyNDk0 IC0gRm9udCBzZXR0aW5ncyBvZiBpYnVzIGFyZSBpZ25vcmVkIG9uIG5vbi1Hbm9tZQoKLS0tCmRp ZmYgLS1naXQgYS9pYnVzLUhFQUQucGF0Y2ggYi9pYnVzLUhFQUQucGF0Y2gKaW5kZXggZDA4YjIx OC4uYjE1ODhhNyAxMDA2NDQKLS0tIGEvaWJ1cy1IRUFELnBhdGNoCisrKyBiL2lidXMtSEVBRC5w YXRjaApAQCAtMzkyLDMgKzM5MiwyMzkgQEAgaW5kZXggMjNlMWM5ZC4uNjVjMzNhMCAxMDA2NDQK IC0tIAogMi43LjQKIAorRnJvbSA1MmI3MjcyZDk3YTg4MWE4YTZjODcyZTI4YzE5NzBlYzQ3Y2I0 MzM3IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogUGVuZyBXdSA8YWxleGVwaWNvQGdt YWlsLmNvbT4KK0RhdGU6IFdlZCwgMTIgT2N0IDIwMTYgMTU6MTc6MjQgKzA5MDAKK1N1YmplY3Q6 IFtQQVRDSF0gdWkvZ3RrMzogc3VwcG9ydCBzY3JvbGwgZXZlbnQgaW4gY2FuZGlkYXRlcyBwYW5l bAorCitXaGVuIHByZXNzIHNjcm9sbCBidXR0b24gb2YgbW91c2Ugb24gY2FuZGlkYXRlcywKK2F1 dG9tYXRpY2FsbHkgY3Vyc29yIHVwL2N1cnNvciBkb3duLgorCitCVUc9CitSPXRha2FvLmZ1aml3 YXJhMUBnbWFpbC5jb20KKworUmV2aWV3IFVSTDogaHR0cHM6Ly9jb2RlcmV2aWV3LmFwcHNwb3Qu Y29tLzMwMjcwMDA0MworCitQYXRjaCBmcm9tIFBlbmcgV3UgPGFsZXhlcGljb0BnbWFpbC5jb20+ LgorLS0tCisgdWkvZ3RrMy9jYW5kaWRhdGVhcmVhLnZhbGEgfCAzMyArKysrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0KKyB1aS9ndGszL3BhbmVsLnZhbGEgICAgICAgICB8ICAyICsrCisg MiBmaWxlcyBjaGFuZ2VkLCAzMSBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQorCitkaWZm IC0tZ2l0IGEvdWkvZ3RrMy9jYW5kaWRhdGVhcmVhLnZhbGEgYi91aS9ndGszL2NhbmRpZGF0ZWFy ZWEudmFsYQoraW5kZXggMzg0OGYwZC4uODhkYjI2OCAxMDA2NDQKKy0tLSBhL3VpL2d0azMvY2Fu ZGlkYXRlYXJlYS52YWxhCisrKysgYi91aS9ndGszL2NhbmRpZGF0ZWFyZWEudmFsYQorQEAgLTYx LDYgKzYxLDE4IEBAIGNsYXNzIENhbmRpZGF0ZUFyZWEgOiBHdGsuQm94IHsKKyAgICAgICAgIHNl dF92ZXJ0aWNhbCh2ZXJ0aWNhbCwgdHJ1ZSk7CisgICAgIH0KKyAKKysgICAgcHVibGljIGJvb2wg Y2FuZGlkYXRlX3Njcm9sbGVkKEdkay5FdmVudFNjcm9sbCBldmVudCkgeworKyAgICAgICAgc3dp dGNoIChldmVudC5kaXJlY3Rpb24pIHsKKysgICAgICAgIGNhc2UgR2RrLlNjcm9sbERpcmVjdGlv bi5VUDoKKysgICAgICAgICAgICBjdXJzb3JfdXAoKTsKKysgICAgICAgICAgICBicmVhazsKKysg ICAgICAgIGNhc2UgR2RrLlNjcm9sbERpcmVjdGlvbi5ET1dOOgorKyAgICAgICAgICAgIGN1cnNv cl9kb3duKCk7CisrICAgICAgICAgICAgYnJlYWs7CisrICAgICAgICB9CisrICAgICAgICByZXR1 cm4gdHJ1ZTsKKysgICAgfQorKworICAgICBwdWJsaWMgYm9vbCBnZXRfdmVydGljYWwoKSB7Cisg ICAgICAgICByZXR1cm4gbV92ZXJ0aWNhbDsKKyAgICAgfQorQEAgLTE2Nyw5ICsxNzksMTcgQEAg Y2xhc3MgQ2FuZGlkYXRlQXJlYSA6IEd0ay5Cb3ggeworICAgICAgICAgbmV4dF9idXR0b24uc2V0 X3JlbGllZihHdGsuUmVsaWVmU3R5bGUuTk9ORSk7CisgCisgICAgICAgICBpZiAobV92ZXJ0aWNh bCkgeworKyAgICAgICAgICAgIEd0ay5FdmVudEJveCBjb250YWluZXJfZWJveCA9IG5ldyBHdGsu RXZlbnRCb3goKTsKKysgICAgICAgICAgICBjb250YWluZXJfZWJveC5hZGRfZXZlbnRzKEdkay5F dmVudE1hc2suU0NST0xMX01BU0spOworKyAgICAgICAgICAgIGNvbnRhaW5lcl9lYm94LnNjcm9s bF9ldmVudC5jb25uZWN0KGNhbmRpZGF0ZV9zY3JvbGxlZCk7CisrICAgICAgICAgICAgYWRkKGNv bnRhaW5lcl9lYm94KTsKKysKKysgICAgICAgICAgICBHdGsuQm94IHZib3ggPSBuZXcgR3RrLkJv eChHdGsuT3JpZW50YXRpb24uVkVSVElDQUwsIDApOworKyAgICAgICAgICAgIGNvbnRhaW5lcl9l Ym94LmFkZCh2Ym94KTsKKysKKyAgICAgICAgICAgICAvLyBBZGQgQ2FuZGlkYXRlcworICAgICAg ICAgICAgIEd0ay5Cb3ggY2FuZGlkYXRlc19oYm94ID0gbmV3IEd0ay5Cb3goR3RrLk9yaWVudGF0 aW9uLkhPUklaT05UQUwsIDApOworLSAgICAgICAgICAgIHBhY2tfc3RhcnQoY2FuZGlkYXRlc19o Ym94LCBmYWxzZSwgZmFsc2UsIDApOworKyAgICAgICAgICAgIHZib3gucGFja19zdGFydChjYW5k aWRhdGVzX2hib3gsIGZhbHNlLCBmYWxzZSwgMCk7CisgICAgICAgICAgICAgR3RrLkJveCBsYWJl bHNfdmJveCA9IG5ldyBHdGsuQm94KEd0ay5PcmllbnRhdGlvbi5WRVJUSUNBTCwgMCk7CisgICAg ICAgICAgICAgbGFiZWxzX3Zib3guc2V0X2hvbW9nZW5lb3VzKHRydWUpOworICAgICAgICAgICAg IEd0ay5Cb3ggY2FuZGlkYXRlc192Ym94ID0gbmV3IEd0ay5Cb3goR3RrLk9yaWVudGF0aW9uLlZF UlRJQ0FMLCAwKTsKK0BAIC0xNzksNyArMTk5LDcgQEAgY2xhc3MgQ2FuZGlkYXRlQXJlYSA6IEd0 ay5Cb3ggeworICAgICAgICAgICAgIGNhbmRpZGF0ZXNfaGJveC5wYWNrX3N0YXJ0KGNhbmRpZGF0 ZXNfdmJveCwgdHJ1ZSwgdHJ1ZSwgNCk7CisgCisgICAgICAgICAgICAgLy8gQWRkIEhTZXBhcmF0 b3IKKy0gICAgICAgICAgICBwYWNrX3N0YXJ0KG5ldyBIU2VwYXJhdG9yKCksIGZhbHNlLCBmYWxz ZSwgMCk7CisrICAgICAgICAgICAgdmJveC5wYWNrX3N0YXJ0KG5ldyBIU2VwYXJhdG9yKCksIGZh bHNlLCBmYWxzZSwgMCk7CisgCisgICAgICAgICAgICAgLy8gQWRkIGJ1dHRvbnMKKyAgICAgICAg ICAgICBHdGsuQm94IGJ1dHRvbnNfaGJveCA9IG5ldyBHdGsuQm94KEd0ay5PcmllbnRhdGlvbi5I T1JJWk9OVEFMLCAwKTsKK0BAIC0xODgsNyArMjA4LDcgQEAgY2xhc3MgQ2FuZGlkYXRlQXJlYSA6 IEd0ay5Cb3ggeworICAgICAgICAgICAgIGJ1dHRvbnNfaGJveC5wYWNrX3N0YXJ0KHN0YXRlX2xh YmVsLCB0cnVlLCB0cnVlLCAwKTsKKyAgICAgICAgICAgICBidXR0b25zX2hib3gucGFja19zdGFy dChwcmV2X2J1dHRvbiwgZmFsc2UsIGZhbHNlLCAwKTsKKyAgICAgICAgICAgICBidXR0b25zX2hi b3gucGFja19zdGFydChuZXh0X2J1dHRvbiwgZmFsc2UsIGZhbHNlLCAwKTsKKy0gICAgICAgICAg ICBwYWNrX3N0YXJ0KGJ1dHRvbnNfaGJveCwgZmFsc2UsIGZhbHNlLCAwKTsKKysgICAgICAgICAg ICB2Ym94LnBhY2tfc3RhcnQoYnV0dG9uc19oYm94LCBmYWxzZSwgZmFsc2UsIDApOworIAorICAg ICAgICAgICAgIG1fbGFiZWxzID0ge307CisgICAgICAgICAgICAgbV9jYW5kaWRhdGVzID0ge307 CitAQCAtMjM0LDggKzI1NCwxMyBAQCBjbGFzcyBDYW5kaWRhdGVBcmVhIDogR3RrLkJveCB7Cisg ICAgICAgICAgICAgICAgIG1fd2lkZ2V0cyArPSBjYW5kaWRhdGVfZWJveDsKKyAgICAgICAgICAg ICB9CisgICAgICAgICB9IGVsc2UgeworKyAgICAgICAgICAgIEd0ay5FdmVudEJveCBjb250YWlu ZXJfZWJveCA9IG5ldyBHdGsuRXZlbnRCb3goKTsKKysgICAgICAgICAgICBjb250YWluZXJfZWJv eC5hZGRfZXZlbnRzKEdkay5FdmVudE1hc2suU0NST0xMX01BU0spOworKyAgICAgICAgICAgIGNv bnRhaW5lcl9lYm94LnNjcm9sbF9ldmVudC5jb25uZWN0KGNhbmRpZGF0ZV9zY3JvbGxlZCk7Cisr ICAgICAgICAgICAgYWRkKGNvbnRhaW5lcl9lYm94KTsKKysKKyAgICAgICAgICAgICBHdGsuQm94 IGhib3ggPSBuZXcgR3RrLkJveChHdGsuT3JpZW50YXRpb24uSE9SSVpPTlRBTCwgMCk7CistICAg ICAgICAgICAgYWRkKGhib3gpOworKyAgICAgICAgICAgIGNvbnRhaW5lcl9lYm94LmFkZChoYm94 KTsKKyAKKyAgICAgICAgICAgICBtX2xhYmVscyA9IHt9OworICAgICAgICAgICAgIG1fY2FuZGlk YXRlcyA9IHt9OworZGlmZiAtLWdpdCBhL3VpL2d0azMvcGFuZWwudmFsYSBiL3VpL2d0azMvcGFu ZWwudmFsYQoraW5kZXggY2MxOTM1MC4uZWUwOGM1OSAxMDA2NDQKKy0tLSBhL3VpL2d0azMvcGFu ZWwudmFsYQorKysrIGIvdWkvZ3RrMy9wYW5lbC52YWxhCitAQCAtMTExLDYgKzExMSw4IEBAIGNs YXNzIFBhbmVsIDogSUJ1cy5QYW5lbFNlcnZpY2UgeworICAgICAgICAgbV9jYW5kaWRhdGVfcGFu ZWwgPSBuZXcgQ2FuZGlkYXRlUGFuZWwoKTsKKyAgICAgICAgIG1fY2FuZGlkYXRlX3BhbmVsLnBh Z2VfdXAuY29ubmVjdCgodykgPT4gdGhpcy5wYWdlX3VwKCkpOworICAgICAgICAgbV9jYW5kaWRh dGVfcGFuZWwucGFnZV9kb3duLmNvbm5lY3QoKHcpID0+IHRoaXMucGFnZV9kb3duKCkpOworKyAg ICAgICAgbV9jYW5kaWRhdGVfcGFuZWwuY3Vyc29yX3VwLmNvbm5lY3QoKHcpID0+IHRoaXMuY3Vy c29yX3VwKCkpOworKyAgICAgICAgbV9jYW5kaWRhdGVfcGFuZWwuY3Vyc29yX2Rvd24uY29ubmVj dCgodykgPT4gdGhpcy5jdXJzb3JfZG93bigpKTsKKyAgICAgICAgIG1fY2FuZGlkYXRlX3BhbmVs LmNhbmRpZGF0ZV9jbGlja2VkLmNvbm5lY3QoCisgICAgICAgICAgICAgICAgICh3LCBpLCBiLCBz KSA9PiB0aGlzLmNhbmRpZGF0ZV9jbGlja2VkKGksIGIsIHMpKTsKKyAKKy0tIAorMi43LjQKKwor RnJvbSBmODBkY2M5NzhmZGM5YTNkNzg1MzQzNGU4NmY0ZWUwMmMyYTkyYjMzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQorRnJvbTogZnVqaXdhcmF0IDx0YWthby5mdWppd2FyYTFAZ21haWwuY29t PgorRGF0ZTogV2VkLCAxMSBKYW4gMjAxNyAxMjoxMToyMiArMDkwMAorU3ViamVjdDogW1BBVENI XSBzcmM6IEF2b2lkIGVtb2ppIHR5cGluZyBkdXJpbmcgVW5pY29kZSB0eXBpbmcKKworSWYgJ3Nr JyBsYXlvdXQgaXMgdXNlZCwgZGlnaXQga2V5cyBuZWVkIFNoaWZ0IGtleSBhbmQKK1VuaWNvZGUg dHlwaW5nIG9mIFUrMUFFIHJlcXVpcmVzIFNoaWZ0IGtleSBhZnRlciBDdHJsLVNoaWZ0LXUuCitU aGlzIHBhdGNoIGRvZXMgbm90IGVuYWJsZSB0aGUgZW1vamkgdHlwaW5nIHdpdGggQ3RybC1TaGlm dC1lCitkdXJpbmcgVW5pY29kZSB0eXBpbmcuCisKK0JVRz1yaGJ6IzE0MDM5ODUKKworUmV2aWV3 IFVSTDogaHR0cHM6Ly9jb2RlcmV2aWV3LmFwcHNwb3QuY29tLzMxMTUxMDA0MworLS0tCisgc3Jj L2lidXNlbmdpbmVzaW1wbGUuYyB8IDEwICsrKysrKy0tLS0KKyAxIGZpbGUgY2hhbmdlZCwgNiBp bnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQorCitkaWZmIC0tZ2l0IGEvc3JjL2lidXNlbmdp bmVzaW1wbGUuYyBiL3NyYy9pYnVzZW5naW5lc2ltcGxlLmMKK2luZGV4IDY1YzMzYTAuLjJhOThk NTggMTAwNjQ0CistLS0gYS9zcmMvaWJ1c2VuZ2luZXNpbXBsZS5jCisrKysgYi9zcmMvaWJ1c2Vu Z2luZXNpbXBsZS5jCitAQCAtMiw4ICsyLDggQEAKKyAvKiB2aW06c2V0IGV0IHN0cz00OiAqLwor IC8qIGlidXMgLSBUaGUgSW5wdXQgQnVzCisgICogQ29weXJpZ2h0IChDKSAyMDE0IFBlbmcgSHVh bmcgPHNoYXduLnAuaHVhbmdAZ21haWwuY29tPgorLSAqIENvcHlyaWdodCAoQykgMjAxNS0yMDE2 IFRha2FvIEZ1aml3YXJhIDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgorLSAqIENvcHlyaWdo dCAoQykgMjAxNC0yMDE2IFJlZCBIYXQsIEluYy4KKysgKiBDb3B5cmlnaHQgKEMpIDIwMTUtMjAx NyBUYWthbyBGdWppd2FyYSA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KKysgKiBDb3B5cmln aHQgKEMpIDIwMTQtMjAxNyBSZWQgSGF0LCBJbmMuCisgICoKKyAgKiBUaGlzIGxpYnJhcnkgaXMg ZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgICogbW9kaWZ5 IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYworQEAg LTExODcsNyArMTE4Nyw4IEBAIGlidXNfZW5naW5lX3NpbXBsZV9wcm9jZXNzX2tleV9ldmVudCAo SUJ1c0VuZ2luZSAqZW5naW5lLAorICAgICB9CisgCisgICAgIC8qIENoZWNrIGZvciBoZXggc2Vx dWVuY2Ugc3RhcnQgKi8KKy0gICAgaWYgKCFwcml2LT5pbl9oZXhfc2VxdWVuY2UgJiYgaGF2ZV9o ZXhfbW9kcyAmJiBpc19oZXhfc3RhcnQpIHsKKysgICAgaWYgKCFwcml2LT5pbl9oZXhfc2VxdWVu Y2UgJiYgIXByaXYtPmluX2Vtb2ppX3NlcXVlbmNlICYmCisrICAgICAgICBoYXZlX2hleF9tb2Rz ICYmIGlzX2hleF9zdGFydCkgeworICAgICAgICAgcHJpdi0+Y29tcG9zZV9idWZmZXJbMF0gPSAw OworICAgICAgICAgcHJpdi0+aW5faGV4X3NlcXVlbmNlID0gVFJVRTsKKyAgICAgICAgIHByaXYt PmluX2Vtb2ppX3NlcXVlbmNlID0gRkFMU0U7CitAQCAtMTIwMCw3ICsxMjAxLDggQEAgaWJ1c19l bmdpbmVfc2ltcGxlX3Byb2Nlc3Nfa2V5X2V2ZW50IChJQnVzRW5naW5lICplbmdpbmUsCisgICAg ICAgICBpYnVzX2VuZ2luZV9zaW1wbGVfdXBkYXRlX3ByZWVkaXRfdGV4dCAoc2ltcGxlKTsKKyAK KyAgICAgICAgIHJldHVybiBUUlVFOworLSAgICB9IGVsc2UgaWYgKCFwcml2LT5pbl9lbW9qaV9z ZXF1ZW5jZSAmJiBoYXZlX2hleF9tb2RzICYmIGlzX2Vtb2ppX3N0YXJ0KSB7CisrICAgIH0gZWxz ZSBpZiAoIXByaXYtPmluX2hleF9zZXF1ZW5jZSAmJiAhcHJpdi0+aW5fZW1vamlfc2VxdWVuY2Ug JiYKKysgICAgICAgICAgICAgICBoYXZlX2hleF9tb2RzICYmIGlzX2Vtb2ppX3N0YXJ0KSB7Cisg ICAgICAgICBwcml2LT5jb21wb3NlX2J1ZmZlclswXSA9IDA7CisgICAgICAgICBwcml2LT5pbl9o ZXhfc2VxdWVuY2UgPSBGQUxTRTsKKyAgICAgICAgIHByaXYtPmluX2Vtb2ppX3NlcXVlbmNlID0g VFJVRTsKKy0tIAorMi43LjQKKworRnJvbSBhYWNmNWFkYmJhOWI5YjM0YTFlYzA3MDA1ZTY3MGQy MDk1MTNmYjViIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogZnVqaXdhcmF0IDx0YWth by5mdWppd2FyYTFAZ21haWwuY29tPgorRGF0ZTogV2VkLCAxMSBKYW4gMjAxNyAxMjoxNjo1OSAr MDkwMAorU3ViamVjdDogW1BBVENIXSB1aS9ndGszOiBGaXggcGFuZWwgQ1NTIGZvcm1hdCBmb3Ig R1RLIDMuMjIKKworR3RrQ3NzUHJvdmlkZXIgbm8gbG9uZ2VyIHdvcmtzIHdpdGggdGhlIFBhbmdv IGZvcm1hdCBpbiBHVEsgMy4yMiBhbmQKK25lZWQgdG8gdXNlIHRoZSBDU1MgZm9ybWF0LgorCitC VUc9aHR0cHM6Ly9naXRodWIuY29tL2lidXMvaWJ1cy9pc3N1ZXMvMTg3OQorCitSZXZpZXcgVVJM OiBodHRwczovL2NvZGVyZXZpZXcuYXBwc3BvdC5jb20vMzE5OTYwMDQzCistLS0KKyB1aS9ndGsz L3BhbmVsLnZhbGEgfCAyMSArKysrKysrKysrKysrKy0tLS0tLS0KKyAxIGZpbGUgY2hhbmdlZCwg MTQgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL3VpL2d0azMv cGFuZWwudmFsYSBiL3VpL2d0azMvcGFuZWwudmFsYQoraW5kZXggZWUwOGM1OS4uNGZiNzU1NSAx MDA2NDQKKy0tLSBhL3VpL2d0azMvcGFuZWwudmFsYQorKysrIGIvdWkvZ3RrMy9wYW5lbC52YWxh CitAQCAtMyw3ICszLDcgQEAKKyAgKiBpYnVzIC0gVGhlIElucHV0IEJ1cworICAqCisgICogQ29w eXJpZ2h0KGMpIDIwMTEtMjAxNCBQZW5nIEh1YW5nIDxzaGF3bi5wLmh1YW5nQGdtYWlsLmNvbT4K Ky0gKiBDb3B5cmlnaHQoYykgMjAxNS0yMDE2IFRha2FvIEZ1andpYXJhIDx0YWthby5mdWppd2Fy YTFAZ21haWwuY29tPgorKyAqIENvcHlyaWdodChjKSAyMDE1LTIwMTcgVGFrYW8gRnVqd2lhcmEg PHRha2FvLmZ1aml3YXJhMUBnbWFpbC5jb20+CisgICoKKyAgKiBUaGlzIGxpYnJhcnkgaXMgZnJl ZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgICogbW9kaWZ5IGl0 IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYworQEAgLTUz OCwyNiArNTM4LDMzIEBAIGNsYXNzIFBhbmVsIDogSUJ1cy5QYW5lbFNlcnZpY2UgeworICAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgIH0KKyAKKy0gICAgICAgIHN0cmluZyBmb250X25hbWUg PSBtX3NldHRpbmdzX3BhbmVsLmdldF9zdHJpbmcoImN1c3RvbS1mb250Iik7CisrICAgICAgICBz dHJpbmcgY3VzdG9tX2ZvbnQgPSBtX3NldHRpbmdzX3BhbmVsLmdldF9zdHJpbmcoImN1c3RvbS1m b250Iik7CisgCistICAgICAgICBpZiAoZm9udF9uYW1lID09IG51bGwpIHsKKysgICAgICAgIGlm IChjdXN0b21fZm9udCA9PSBudWxsKSB7CisgICAgICAgICAgICAgd2FybmluZygiTm8gY29uZmln IHBhbmVsOmN1c3RvbS1mb250LiIpOworICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgIH0K KyAKKy0gICAgICAgIHN0cmluZyBkYXRhX2Zvcm1hdCA9ICJsYWJlbCB7IGZvbnQ6ICVzOyB9IjsK KysgICAgICAgIFBhbmdvLkZvbnREZXNjcmlwdGlvbiBmb250X2Rlc2MgPQorKyAgICAgICAgICAg ICAgICBQYW5nby5Gb250RGVzY3JpcHRpb24uZnJvbV9zdHJpbmcoY3VzdG9tX2ZvbnQpOworKyAg ICAgICAgc3RyaW5nIGZvbnRfZmFtaWx5ID0gZm9udF9kZXNjLmdldF9mYW1pbHkoKTsKKysgICAg ICAgIGludCBmb250X3NpemUgPSBmb250X2Rlc2MuZ2V0X3NpemUoKSAvIFBhbmdvLlNDQUxFOwor KyAgICAgICAgc3RyaW5nIGRhdGE7CisrCisgICAgICAgICBpZiAoR3RrLk1BSk9SX1ZFUlNJT04g PCAzIHx8CisgICAgICAgICAgICAgKEd0ay5NQUpPUl9WRVJTSU9OID09IDMgJiYgR3RrLk1JTk9S X1ZFUlNJT04gPCAyMCkpIHsKKy0gICAgICAgICAgICBkYXRhX2Zvcm1hdCA9ICJHdGtMYWJlbCB7 IGZvbnQ6ICVzOyB9IjsKKysgICAgICAgICAgICBkYXRhID0gIkd0a0xhYmVsIHsgZm9udDogJXM7 IH0iLnByaW50ZihjdXN0b21fZm9udCk7CisrICAgICAgICB9IGVsc2UgeworKyAgICAgICAgICAg IGRhdGEgPSAibGFiZWwgeyBmb250LWZhbWlseTogJXM7IGZvbnQtc2l6ZTogJWRwdDsgfSIKKysg ICAgICAgICAgICAgICAgICAgICAgICAgICAucHJpbnRmKGZvbnRfZmFtaWx5LCBmb250X3NpemUp OworICAgICAgICAgfQorIAorLSAgICAgICAgc3RyaW5nIGRhdGEgPSBkYXRhX2Zvcm1hdC5wcmlu dGYoZm9udF9uYW1lKTsKKyAgICAgICAgIG1fY3NzX3Byb3ZpZGVyID0gbmV3IEd0ay5Dc3NQcm92 aWRlcigpOworIAorICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgICBtX2Nzc19wcm92aWRlci5s b2FkX2Zyb21fZGF0YShkYXRhLCAtMSk7CisgICAgICAgICB9IGNhdGNoIChHTGliLkVycm9yIGUp IHsKKy0gICAgICAgICAgICB3YXJuaW5nKCJGYWlsZWQgY3NzX3Byb3ZpZGVyX2Zyb21fZGF0YTog JXM6ICVzIiwgZm9udF9uYW1lLAorKyAgICAgICAgICAgIHdhcm5pbmcoIkZhaWxlZCBjc3NfcHJv dmlkZXJfZnJvbV9kYXRhOiAlczogJXMiLCBjdXN0b21fZm9udCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZS5tZXNzYWdlKTsK KyAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICB9CistLSAKKzIuNy40CisKCmRpZmYgLS1n aXQgYS9pYnVzLnNwZWMgYi9pYnVzLnNwZWMKaW5kZXggZmNjOTZjYi4uYjNhYjJkNCAxMDA2NDQK LS0tIGEvaWJ1cy5zcGVjCisrKyBiL2lidXMuc3BlYwpAQCAtMjgsNyArMjgsNyBAQAogCiBOYW1l OiAgICAgICAgICAgaWJ1cwogVmVyc2lvbjogICAgICAgIDEuNS4xNAotUmVsZWFzZTogICAgICAg IDQlez9kaXN0fQorUmVsZWFzZTogICAgICAgIDUlez9kaXN0fQogU3VtbWFyeTogICAgICAgIElu dGVsbGlnZW50IElucHV0IEJ1cyBmb3IgTGludXggT1MKIExpY2Vuc2U6ICAgICAgICBMR1BMdjIr CiBHcm91cDogICAgICAgICAgU3lzdGVtIEVudmlyb25tZW50L0xpYnJhcmllcwpAQCAtNDI0LDYg KzQyNCwxMSBAQCBndGstcXVlcnktaW1tb2R1bGVzLTMuMC0le19faXNhX2JpdHN9IC0tdXBkYXRl LWNhY2hlICY+IC9kZXYvbnVsbCB8fCA6CiAle19kYXRhZGlyfS9ndGstZG9jL2h0bWwvKgogCiAl Y2hhbmdlbG9nCisqIFdlZCBKYW4gMTEgMjAxNyBUYWthbyBGdWppd2FyYSA8dGZ1aml3YXJAcmVk aGF0LmNvbT4gLSAxLjUuMTQtNQorLSBzdXBwb3J0IHNjcm9sbCBldmVudCBpbiBjYW5kaWRhdGVz IHBhbmVsCistIEZpeGVkIEJ1ZyAxNDAzOTg1IC0gRW1vamkgdHlwaW5nIGlzIGVuYWJsZWQgZHVy aW5nIFVuaWNvZGUgdHlwaW5nCistIEZpeGVkIEJ1ZyAxNDAyNDk0IC0gRm9udCBzZXR0aW5ncyBv ZiBpYnVzIGFyZSBpZ25vcmVkIG9uIG5vbi1Hbm9tZQorCiAqIE1vbiBEZWMgMTkgMjAxNiBNaXJv IEhyb27EjW9rIDxtaHJvbmNva0ByZWRoYXQuY29tPiAtIDEuNS4xNC00CiAtIFJlYnVpbGQgZm9y IFB5dGhvbiAzLjYKIAo=