From kde-kimageshop Fri Oct 08 11:40:19 2021 From: Halla Rempt Date: Fri, 08 Oct 2021 11:40:19 +0000 To: kde-kimageshop Subject: =?utf-8?q?=5Bgraphics/krita=5D_libs=3A_Fix_consistency_of_=27dependent=5Fresources=5Ffilenames=27_me Message-Id: <20211008114019.44A0E124155D () leptone ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-kimageshop&m=163369319415734 R2l0IGNvbW1pdCA0MzE4NmMyOWI2MTdjOTUxOTJlYjJjY2ZiZTY4M2EzY2IwY2E5NjI4IGJ5IEhh bGxhIFJlbXB0LCBvbiBiZWhhbGYgb2YgRG1pdHJ5IEthemFrb3YuCkNvbW1pdHRlZCBvbiAwOC8x MC8yMDIxIGF0IDExOjM5LgpQdXNoZWQgYnkgcmVtcHQgaW50byBicmFuY2ggJ21hc3RlcicuCgpG aXggY29uc2lzdGVuY3kgb2YgJ2RlcGVuZGVudF9yZXNvdXJjZXNfZmlsZW5hbWVzJyBtZXRhZGF0 YQoKTm93IHRoZSB1cGRhdGUgb2YgdGhpcyBtZXRhZGF0YSBpcyByZXF1ZXN0ZWQgYnkgS2lzUmVz b3VyY2VMb2NhdG9yCmV2ZXJ5IHRpbWUgYSBuZXcgdmVyc2lvbiBvZiB0aGUgcmVzb3VyY2UgaXMg YWRkZWQgdG8gdGhlIGRhdGFiYXNlLgoKQXMgbm90ZWQgaW4gdGhlIGNvbW1ldHMsIHRoaXMgY2hl Y2sgd29ya3Mgb25seSBmb3IgbGVnYWN5IHByZXNldHMsCndoaWNoIGRvbid0IGluY2x1ZGUgYWxs IHRoZWlyIGRlcGVuZGVudCByZXNvdXJjZXMuIEZvciB0aGUgbW9kZXJuCnByZXNldHMgd2UgZG9u J3QgY2hlY2sgaWYgdGhlIGRlcGVuZGVudCByZXNvdXJjZXMgaGFzIGJlZW4gbG9hZGVkCnN1Y2Nl c3NmdWxseSBvciBub3QuIFdlIGp1c3QgaG9wZSB0aGF0IHRoZXkgaGF2ZSBiZWVuIGVtYmVkZWQK Y29ycmVjdGx5LgoKV0FSTklORzogdGhlIHByZXZpb3VzIGNvZGUgc29tZXRpbWVzIGdlbmVyYXRl ZCBpbmNvcnJlY3QKImRlcGVuZGVudF9yZXNvdXJjZXNfZmlsZW5hbWVzIiBpbmZvcm1hdGlvbi4g SWYgeW91ciByZXNvdXJjZXMgYmVjYW1lCm1hcmtlZCBhcyAiYnJva2VuIiwganVzdCBhY3RpdmF0 ZSB0aGVtIHRvIHVwZGF0ZSB0aGUgbWV0YWRhdGEuCgpDQzpraW1hZ2VzaG9wQGtkZS5vcmcKCk0g ICs0NiAgIC0yMCAgIGxpYnMvaW1hZ2UvYnJ1c2hlbmdpbmUva2lzX3BhaW50b3BfcHJlc2V0LmNw cApNICArMiAgICAtMCAgICBsaWJzL2ltYWdlL2JydXNoZW5naW5lL2tpc19wYWludG9wX3ByZXNl dC5oCk0gICs1ICAgIC0wICAgIGxpYnMvcmVzb3VyY2VzL0tpc1Jlc291cmNlTG9jYXRvci5jcHAK TSAgKzQgICAgLTAgICAgbGlicy9yZXNvdXJjZXMvS29SZXNvdXJjZS5jcHAKTSAgKzkgICAgLTAg ICAgbGlicy9yZXNvdXJjZXMvS29SZXNvdXJjZS5oCgpodHRwczovL2ludmVudC5rZGUub3JnL2dy YXBoaWNzL2tyaXRhL2NvbW1pdC80MzE4NmMyOWI2MTdjOTUxOTJlYjJjY2ZiZTY4M2EzY2IwY2E5 NjI4CgpkaWZmIC0tZ2l0IGEvbGlicy9pbWFnZS9icnVzaGVuZ2luZS9raXNfcGFpbnRvcF9wcmVz ZXQuY3BwIGIvbGlicy9pbWFnZS9icnVzaGVuZ2luZS9raXNfcGFpbnRvcF9wcmVzZXQuY3BwCmlu ZGV4IGVkY2QzNjUwNWEuLjRkODQ4YzRiOGIgMTAwNjQ0Ci0tLSBhL2xpYnMvaW1hZ2UvYnJ1c2hl bmdpbmUva2lzX3BhaW50b3BfcHJlc2V0LmNwcAorKysgYi9saWJzL2ltYWdlL2JydXNoZW5naW5l L2tpc19wYWludG9wX3ByZXNldC5jcHAKQEAgLTY0LDEzICs2NCwxNSBAQCBzdHJ1Y3QgUV9ERUNM X0hJRERFTiBLaXNQYWludE9wUHJlc2V0OjpQcml2YXRlIHsKIAogcHVibGljOgogICAgIFByaXZh dGUoS2lzUGFpbnRPcFByZXNldCAqcSkKLSAgICAgICAgOiBzZXR0aW5nc1VwZGF0ZUxpc3RlbmVy KG5ldyBVcGRhdGVMaXN0ZW5lcihxKSkKKyAgICAgICAgOiBzZXR0aW5nc1VwZGF0ZUxpc3RlbmVy KG5ldyBVcGRhdGVMaXN0ZW5lcihxKSksCisgICAgICAgICAgdmVyc2lvbigiNS4wIikKICAgICB7 CiAgICAgfQogCiAgICAgS2lzUGFpbnRPcFNldHRpbmdzU1Agc2V0dGluZ3MgezB9OwogICAgIFFT Y29wZWRQb2ludGVyPEtpc1BhaW50T3BQcmVzZXRVcGRhdGVQcm94eT4gdXBkYXRlUHJveHk7CiAg ICAgS2lzUGFpbnRPcFNldHRpbmdzOjpVcGRhdGVMaXN0ZW5lclNQIHNldHRpbmdzVXBkYXRlTGlz dGVuZXI7CisgICAgUVN0cmluZyB2ZXJzaW9uOwogfTsKIAogCkBAIC0xNjUsMTEgKzE2NywxMSBA QCBib29sIEtpc1BhaW50T3BQcmVzZXQ6OmxvYWRGcm9tRGV2aWNlKFFJT0RldmljZSAqZGV2LCBL aXNSZXNvdXJjZXNJbnRlcmZhY2VTUCByZQogewogICAgIFFJbWFnZVJlYWRlciByZWFkZXIoZGV2 LCAiUE5HIik7CiAKLSAgICBRU3RyaW5nIHZlcnNpb24gPSByZWFkZXIudGV4dCgidmVyc2lvbiIp OworICAgIGQtPnZlcnNpb24gPSByZWFkZXIudGV4dCgidmVyc2lvbiIpOwogICAgIFFTdHJpbmcg cHJlc2V0ID0gcmVhZGVyLnRleHQoInByZXNldCIpOwogICAgIGludCByZXNvdXJjZUNvdW50ID0g cmVhZGVyLnRleHQoImVtYmVkZGVkX3Jlc291cmNlcyIpLnRvSW50KCk7CiAKLSAgICBpZiAoISh2 ZXJzaW9uID09ICIyLjIiIHx8ICI1LjAiKSkgeworICAgIGlmICghKGQtPnZlcnNpb24gPT0gIjIu MiIgfHwgIjUuMCIpKSB7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKQEAgLTE4OSw3 ICsxOTEsNyBAQCBib29sIEtpc1BhaW50T3BQcmVzZXQ6OmxvYWRGcm9tRGV2aWNlKFFJT0Rldmlj ZSAqZGV2LCBLaXNSZXNvdXJjZXNJbnRlcmZhY2VTUCByZQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgfQogCi0gICAgaWYgKHZlcnNpb24gPT0gIjUuMCIgJiYgcmVzb3VyY2VDb3VudCA+IDAp IHsKKyAgICBpZiAoZC0+dmVyc2lvbiA9PSAiNS4wIiAmJiByZXNvdXJjZUNvdW50ID4gMCkgewog ICAgICAgICAvLyBMb2FkIHRoZSBlbWJlZGRlZCByZXNvdXJjZXMKICAgICAgICAgUURvbU5vZGUg biA9IGRvYy5maXJzdENoaWxkKCk7CiAgICAgICAgIHdoaWxlICghbi5pc051bGwoKSkgewpAQCAt MjQ1LDIxICsyNDcsNiBAQCBib29sIEtpc1BhaW50T3BQcmVzZXQ6OmxvYWRGcm9tRGV2aWNlKFFJ T0RldmljZSAqZGV2LCBLaXNSZXNvdXJjZXNJbnRlcmZhY2VTUCByZQogCiAgICAgc2V0VmFsaWQo ZC0+c2V0dGluZ3MtPmlzVmFsaWQoKSk7CiAKLSAgICB7Ci0gICAgICAgIFFMaXN0PEtvUmVzb3Vy Y2VTUD4gZGVwZW5kZW50UmVzb3VyY2VzID0gdGhpcy0+cmVxdWlyZWRSZXNvdXJjZXMocmVzb3Vy Y2VzSW50ZXJmYWNlKTsKLSAgICAgICAgS3JpdGFVdGlsczo6bWFrZUNvbnRhaW5lclVuaXF1ZShk ZXBlbmRlbnRSZXNvdXJjZXMpOwotCi0gICAgICAgIFFTdHJpbmdMaXN0IHJlc291cmNlRmlsZU5h bWVzOwotCi0gICAgICAgIFFfRk9SRUFDSCAoS29SZXNvdXJjZVNQIHJlc291cmNlLCBkZXBlbmRl bnRSZXNvdXJjZXMpIHsKLSAgICAgICAgICAgIHJlc291cmNlRmlsZU5hbWVzLmFwcGVuZChyZXNv dXJjZS0+ZmlsZW5hbWUoKSk7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAoIXJlc291cmNlRmls ZU5hbWVzLmlzRW1wdHkoKSkgewotICAgICAgICAgICAgYWRkTWV0YURhdGEoImRlcGVuZGVudF9y ZXNvdXJjZXNfZmlsZW5hbWVzIiwgcmVzb3VyY2VGaWxlTmFtZXMpOwotICAgICAgICB9Ci0gICAg fQotCiAgICAgc2V0SW1hZ2UoaW1nKTsKIAogICAgIHJldHVybiB0cnVlOwpAQCAtMzcwLDcgKzM1 NywyMiBAQCBib29sIEtpc1BhaW50T3BQcmVzZXQ6OnNhdmVUb0RldmljZShRSU9EZXZpY2UgKmRl dikgY29uc3QKIAogICAgIGRvYy5hcHBlbmRDaGlsZChyb290KTsKIAotICAgIHdyaXRlci5zZXRU ZXh0KCJ2ZXJzaW9uIiwgIjUuMCIpOworICAgIC8qKgorICAgICAqIEhBQ0sgQUxFUlQ6IFdlIHVw ZGF0ZSB0aGUgdmVyc2lvbiBvZiB0aGUgcmVzb3VyY2UgZm9ybWF0IG9uCisgICAgICogdGhlIGZp cnN0IHNhdmUgb3BlcmF0aW9uLCBldmVuIHRob3VnaCB0aGVyZSBpcyBubyBndWFyYW50ZWUKKyAg ICAgKiB0aGF0IGl0IHdhcyAic2F2ZSIgb3BlcmF0aW9uLCBidXQgbm90ICJleHBvcnQiIG9wZXJh dGlvbi4KKyAgICAgKgorICAgICAqIFRoZSBvbmx5IHBvaW50IGl0IGFmZmVjdHMgbm93IGlzIHdo ZXRoZXIgd2UgbmVlZCB0byBjaGVjaworICAgICAqIGZvciB0aGUgcHJlc2VuY2Ugb2YgdGhlIGxp bmtlZFJlc291cmNlcygpIGluCisgICAgICogdXBkYXRlTGlua2VkUmVzb3VyY2VzTWV0YURhdGEo KS4gVGhlIG5ldyB2ZXJzaW9uIG9mIHRoZQorICAgICAqIHByZXNldCBmb3JtYXQgKCI1LjAiKSBo YXMgYWxsIHRoZSBsaW5rZWQgcmVzb3VyY2VzIGVtYmVkZGVkCisgICAgICogb3V0c2lkZSBLaXNQ YWludE9wU2V0dGluZ3MsIHdoaWNoIGFyZSBhdXRvbWF0aWNhbGx5CisgICAgICogbG9hZGVkIG9u IHRoZSB0aGUgcmVzb3VyY2UgYWN0aXZhdGlvbi4gV2Ugd2Ugc2hvdWxkbid0CisgICAgICogYWRk IHRoZW0gaW50byBtZXRhRGF0YSgpWyJkZXBlbmRlbnRfcmVzb3VyY2VzX2ZpbGVuYW1lcyJdLgor ICAgICAqLworICAgIGQtPnZlcnNpb24gPSAiNS4wIjsKKworICAgIHdyaXRlci5zZXRUZXh0KCJ2 ZXJzaW9uIiwgZC0+dmVyc2lvbik7CiAgICAgd3JpdGVyLnNldFRleHQoInByZXNldCIsIGRvYy50 b1N0cmluZygpKTsKIAogICAgIFFJbWFnZSBpbWc7CkBAIC0zODUsNiArMzg3LDMwIEBAIGJvb2wg S2lzUGFpbnRPcFByZXNldDo6c2F2ZVRvRGV2aWNlKFFJT0RldmljZSAqZGV2KSBjb25zdAogCiB9 CiAKK3ZvaWQgS2lzUGFpbnRPcFByZXNldDo6dXBkYXRlTGlua2VkUmVzb3VyY2VzTWV0YURhdGEo S2lzUmVzb3VyY2VzSW50ZXJmYWNlU1AgcmVzb3VyY2VzSW50ZXJmYWNlKQoreworICAgIC8qKgor ICAgICAqIFRoZSBuZXcgcHJlc2V0IGZvcm1hdCBlbWJlZHMgYWxsIHRoZSBsaW5rZWQgcmVzb3Vy Y2VzIG91dHNpZGUKKyAgICAgKiBLaXNQYWludE9wU2V0dGluZ3MgYW5kIGxvYWRzIHRoZW0gb24g YWN0aXZhdGlvbiwgdGhlcmVmb3JlIHdlCisgICAgICogc2hvdWxkbid0IGFkZCB0aGVtIGludG8g ImRlcGVuZGVudF9yZXNvdXJjZXNfZmlsZW5hbWVzIi4KKyAgICAgKi8KKworICAgIGlmIChkLT52 ZXJzaW9uID09ICIyLjIiKSB7CisgICAgICAgIFFMaXN0PEtvUmVzb3VyY2VTUD4gZGVwZW5kZW50 UmVzb3VyY2VzID0gdGhpcy0+bGlua2VkUmVzb3VyY2VzKHJlc291cmNlc0ludGVyZmFjZSk7Cisg ICAgICAgIEtyaXRhVXRpbHM6Om1ha2VDb250YWluZXJVbmlxdWUoZGVwZW5kZW50UmVzb3VyY2Vz KTsKKworICAgICAgICBRU3RyaW5nTGlzdCByZXNvdXJjZUZpbGVOYW1lczsKKworICAgICAgICBR X0ZPUkVBQ0ggKEtvUmVzb3VyY2VTUCByZXNvdXJjZSwgZGVwZW5kZW50UmVzb3VyY2VzKSB7Cisg ICAgICAgICAgICByZXNvdXJjZUZpbGVOYW1lcy5hcHBlbmQocmVzb3VyY2UtPmZpbGVuYW1lKCkp OworICAgICAgICB9CisKKyAgICAgICAgaWYgKCFyZXNvdXJjZUZpbGVOYW1lcy5pc0VtcHR5KCkp IHsKKyAgICAgICAgICAgIGFkZE1ldGFEYXRhKCJkZXBlbmRlbnRfcmVzb3VyY2VzX2ZpbGVuYW1l cyIsIHJlc291cmNlRmlsZU5hbWVzKTsKKyAgICAgICAgfQorICAgIH0KK30KKwogUVBvaW50ZXI8 S2lzUGFpbnRPcFByZXNldFVwZGF0ZVByb3h5PiBLaXNQYWludE9wUHJlc2V0Ojp1cGRhdGVQcm94 eSgpIGNvbnN0CiB7CiAgICAgaWYgKCFkLT51cGRhdGVQcm94eSkgewpkaWZmIC0tZ2l0IGEvbGli cy9pbWFnZS9icnVzaGVuZ2luZS9raXNfcGFpbnRvcF9wcmVzZXQuaCBiL2xpYnMvaW1hZ2UvYnJ1 c2hlbmdpbmUva2lzX3BhaW50b3BfcHJlc2V0LmgKaW5kZXggOTNjMDM0NDIyZi4uNzk3ZWZhZjdh NyAxMDA2NDQKLS0tIGEvbGlicy9pbWFnZS9icnVzaGVuZ2luZS9raXNfcGFpbnRvcF9wcmVzZXQu aAorKysgYi9saWJzL2ltYWdlL2JydXNoZW5naW5lL2tpc19wYWludG9wX3ByZXNldC5oCkBAIC0x NDgsNiArMTQ4LDggQEAgcHVibGljOgogICAgICAgICByZXR1cm4gUVBhaXI8UVN0cmluZywgUVN0 cmluZz4oUmVzb3VyY2VUeXBlOjpQYWludE9wUHJlc2V0cywgIiIpOwogICAgIH0KIAorICAgIHZv aWQgdXBkYXRlTGlua2VkUmVzb3VyY2VzTWV0YURhdGEoS2lzUmVzb3VyY2VzSW50ZXJmYWNlU1Ag cmVzb3VyY2VzSW50ZXJmYWNlKSBvdmVycmlkZTsKKwogICAgIHZvaWQgdG9YTUwoUURvbURvY3Vt ZW50JiBkb2MsIFFEb21FbGVtZW50JiBlbHQpIGNvbnN0OwogCiAgICAgdm9pZCBmcm9tWE1MKGNv bnN0IFFEb21FbGVtZW50JiBlbHQsIEtpc1Jlc291cmNlc0ludGVyZmFjZVNQIHJlc291cmNlc0lu dGVyZmFjZSk7CmRpZmYgLS1naXQgYS9saWJzL3Jlc291cmNlcy9LaXNSZXNvdXJjZUxvY2F0b3Iu Y3BwIGIvbGlicy9yZXNvdXJjZXMvS2lzUmVzb3VyY2VMb2NhdG9yLmNwcAppbmRleCAwY2FkNGZj ZGMwLi43Y2UyZGNkNTkzIDEwMDY0NAotLS0gYS9saWJzL3Jlc291cmNlcy9LaXNSZXNvdXJjZUxv Y2F0b3IuY3BwCisrKyBiL2xpYnMvcmVzb3VyY2VzL0tpc1Jlc291cmNlTG9jYXRvci5jcHAKQEAg LTIwMCw2ICsyMDAsNyBAQCBLb1Jlc291cmNlU1AgS2lzUmVzb3VyY2VMb2NhdG9yOjpyZXNvdXJj ZShRU3RyaW5nIHN0b3JhZ2VMb2NhdGlvbiwgY29uc3QgUVN0cmluZwogICAgICAgICAgICAgZC0+ cmVzb3VyY2VDYWNoZVtrZXldID0gcmVzb3VyY2U7CiAgICAgICAgICAgICAvLyBsb2FkIGFsbCB0 aGUgZW1iZWRkZWQgcmVzb3VyY2VzIGludG8gdGVtcG9yYXJ5ICJtZW1vcnkiIHN0b3JhZ2UKICAg ICAgICAgICAgIGxvYWRSZXF1aXJlZFJlc291cmNlcyhyZXNvdXJjZSk7CisgICAgICAgICAgICBy ZXNvdXJjZS0+dXBkYXRlTGlua2VkUmVzb3VyY2VzTWV0YURhdGEoS2lzR2xvYmFsUmVzb3VyY2Vz SW50ZXJmYWNlOjppbnN0YW5jZSgpKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMzY5LDYgKzM3 MCw3IEBAIEtvUmVzb3VyY2VTUCBLaXNSZXNvdXJjZUxvY2F0b3I6OmltcG9ydFJlc291cmNlRnJv bUZpbGUoY29uc3QgUVN0cmluZyAmcmVzb3VyY2VUCiAKICAgICAgICAgUV9BU1NFUlQocmVzb3Vy Y2UtPm1kNVN1bSgpID09IG1kNSk7CiAgICAgICAgIHJlc291cmNlLT5zZXRWZXJzaW9uKDApOwor ICAgICAgICByZXNvdXJjZS0+dXBkYXRlTGlua2VkUmVzb3VyY2VzTWV0YURhdGEoS2lzR2xvYmFs UmVzb3VyY2VzSW50ZXJmYWNlOjppbnN0YW5jZSgpKTsKIAogICAgICAgICAvLyBJbnNlcnQgaW50 byB0aGUgZGF0YWJhc2UKICAgICAgICAgY29uc3QgYm9vbCByZXN1bHQgPSBLaXNSZXNvdXJjZUNh Y2hlRGI6OmFkZFJlc291cmNlKHN0b3JhZ2UsCkBAIC00MTIsNiArNDE0LDcgQEAgYm9vbCBLaXNS ZXNvdXJjZUxvY2F0b3I6OmFkZFJlc291cmNlKGNvbnN0IFFTdHJpbmcgJnJlc291cmNlVHlwZSwg Y29uc3QgS29SZXNvdXIKICAgICByZXNvdXJjZS0+c2V0U3RvcmFnZUxvY2F0aW9uKHN0b3JhZ2VM b2NhdGlvbik7CiAgICAgcmVzb3VyY2UtPnNldE1ENVN1bShzdG9yYWdlLT5yZXNvdXJjZU1kNShy ZXNvdXJjZVR5cGUgKyAiLyIgKyByZXNvdXJjZS0+ZmlsZW5hbWUoKSkpOwogICAgIHJlc291cmNl LT5zZXREaXJ0eShmYWxzZSk7CisgICAgcmVzb3VyY2UtPnVwZGF0ZUxpbmtlZFJlc291cmNlc01l dGFEYXRhKEtpc0dsb2JhbFJlc291cmNlc0ludGVyZmFjZTo6aW5zdGFuY2UoKSk7CiAKICAgICBk LT5yZXNvdXJjZUNhY2hlW1FQYWlyPFFTdHJpbmcsIFFTdHJpbmc+KHN0b3JhZ2VMb2NhdGlvbiwg cmVzb3VyY2VUeXBlICsgIi8iICsgcmVzb3VyY2UtPmZpbGVuYW1lKCkpXSA9IHJlc291cmNlOwog CkBAIC00NTEsNiArNDU0LDcgQEAgYm9vbCBLaXNSZXNvdXJjZUxvY2F0b3I6OnVwZGF0ZVJlc291 cmNlKGNvbnN0IFFTdHJpbmcgJnJlc291cmNlVHlwZSwgY29uc3QgS29SZXMKIAogICAgIHJlc291 cmNlLT5zZXRNRDVTdW0oc3RvcmFnZS0+cmVzb3VyY2VNZDUocmVzb3VyY2VUeXBlICsgIi8iICsg cmVzb3VyY2UtPmZpbGVuYW1lKCkpKTsKICAgICByZXNvdXJjZS0+c2V0RGlydHkoZmFsc2UpOwor ICAgIHJlc291cmNlLT51cGRhdGVMaW5rZWRSZXNvdXJjZXNNZXRhRGF0YShLaXNHbG9iYWxSZXNv dXJjZXNJbnRlcmZhY2U6Omluc3RhbmNlKCkpOwogCiAgICAgLy8gVGhlIHZlcnNpb24gbmVlZHMg YWxyZWFkeSB0byBoYXZlIGJlZW4gaW5jcmVtZW50ZWQKICAgICBpZiAoIUtpc1Jlc291cmNlQ2Fj aGVEYjo6YWRkUmVzb3VyY2VWZXJzaW9uKHJlc291cmNlLT5yZXNvdXJjZUlkKCksIFFEYXRlVGlt ZTo6Y3VycmVudERhdGVUaW1lKCksIHN0b3JhZ2UsIHJlc291cmNlKSkgewpAQCAtNDgzLDYgKzQ4 Nyw3IEBAIGJvb2wgS2lzUmVzb3VyY2VMb2NhdG9yOjpyZWxvYWRSZXNvdXJjZShjb25zdCBRU3Ry aW5nICZyZXNvdXJjZVR5cGUsIGNvbnN0IEtvUmVzCiAKICAgICByZXNvdXJjZS0+c2V0TUQ1U3Vt KHN0b3JhZ2UtPnJlc291cmNlTWQ1KHJlc291cmNlVHlwZSArICIvIiArIHJlc291cmNlLT5maWxl bmFtZSgpKSk7CiAgICAgcmVzb3VyY2UtPnNldERpcnR5KGZhbHNlKTsKKyAgICByZXNvdXJjZS0+ dXBkYXRlTGlua2VkUmVzb3VyY2VzTWV0YURhdGEoS2lzR2xvYmFsUmVzb3VyY2VzSW50ZXJmYWNl OjppbnN0YW5jZSgpKTsKIAogICAgIC8vIFdlIGhhdmVuJ3QgY2hhbmdlZCB0aGUgdmVyc2lvbiBv ZiB0aGUgcmVzb3VyY2UsIHNvIHRoZSBjYWNoZSBtdXN0IGJlIHN0aWxsIHZhbGlkCiAgICAgUVBh aXI8UVN0cmluZywgUVN0cmluZz4ga2V5ID0gUVBhaXI8UVN0cmluZywgUVN0cmluZz4gKHN0b3Jh Z2VMb2NhdGlvbiwgcmVzb3VyY2VUeXBlICsgIi8iICsgcmVzb3VyY2UtPmZpbGVuYW1lKCkpOwpk aWZmIC0tZ2l0IGEvbGlicy9yZXNvdXJjZXMvS29SZXNvdXJjZS5jcHAgYi9saWJzL3Jlc291cmNl cy9Lb1Jlc291cmNlLmNwcAppbmRleCA1YmJkMmZhNTNiLi5kNWNhY2QyYzk2IDEwMDY0NAotLS0g YS9saWJzL3Jlc291cmNlcy9Lb1Jlc291cmNlLmNwcAorKysgYi9saWJzL3Jlc291cmNlcy9Lb1Jl c291cmNlLmNwcApAQCAtMTI0LDYgKzEyNCwxMCBAQCB2b2lkIEtvUmVzb3VyY2U6OnVwZGF0ZVRo dW1ibmFpbCgpCiB7CiB9CiAKK3ZvaWQgS29SZXNvdXJjZTo6dXBkYXRlTGlua2VkUmVzb3VyY2Vz TWV0YURhdGEoS2lzUmVzb3VyY2VzSW50ZXJmYWNlU1AgcmVzb3VyY2VzSW50ZXJmYWNlKQorewor fQorCiBRSW1hZ2UgS29SZXNvdXJjZTo6dGh1bWJuYWlsKCkgY29uc3QKIHsKICAgICByZXR1cm4g aW1hZ2UoKTsKZGlmZiAtLWdpdCBhL2xpYnMvcmVzb3VyY2VzL0tvUmVzb3VyY2UuaCBiL2xpYnMv cmVzb3VyY2VzL0tvUmVzb3VyY2UuaAppbmRleCAwOWUzNmRhNzEzLi45NTQ3OTQ0Yjk5IDEwMDY0 NAotLS0gYS9saWJzL3Jlc291cmNlcy9Lb1Jlc291cmNlLmgKKysrIGIvbGlicy9yZXNvdXJjZXMv S29SZXNvdXJjZS5oCkBAIC05MSw2ICs5MSwxNSBAQCBwdWJsaWM6CiAgICAgICovCiAgICAgdmly dHVhbCB2b2lkIHVwZGF0ZVRodW1ibmFpbCgpOwogCisgICAgLyoqCisgICAgICogUmVxdWVzdHMg dGhlIHJlc291cmNlIHRvIHVwZGF0ZSBpdHMgbGlua2VkLXJlc291cmNlcworICAgICAqIG1ldGFk YXRhIHN0b3JlZCBpbiBtZXRhRGF0YSgpWyJkZXBlbmRlbnRfcmVzb3VyY2VzX2ZpbGVuYW1lcyJd LgorICAgICAqCisgICAgICogVGhpcyByZXF1ZXN0IGNvbWVzIGZyb20gS2lzUmVzb3VyY2VMb2Nh dG9yIGV2ZXJ5IHRpbWUgYQorICAgICAqIG5ldyB2ZXJzaW9uIG9mIHRoZSByZXNvdXJjZSBpcyBh ZGRlZCB0byB0aGUgZGF0YWJhc2UuCisgICAgICovCisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUxp bmtlZFJlc291cmNlc01ldGFEYXRhKEtpc1Jlc291cmNlc0ludGVyZmFjZVNQIHJlc291cmNlc0lu dGVyZmFjZSk7CisKICAgICAvKioKICAgICAgKiBAYnJpZWYgdGh1bWJuYWlsIHRoZSB0aHVtYm5h aWwgaW1hZ2UgdG8gdXNlIGluIHJlc291cmNlIHNlbGVjdG9ycwogICAgICAqIEByZXR1cm4gYSB2 YWxpZCBxaW1hZ2UuIEFsbCB0aHVtYm5haWxzIGZvciBhIGdpdmVuIHJlc291cmNlIGhhdmUgdGhl Cg==