42299 2010-07-14 15:50:26 -0700 [WinCairo] Fix Build for WebKit2 Project Structure 2010-07-15 11:22:06 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham bweinstein oldest_to_newest 251480 0 bfulgham 2010-07-14 15:50:26 -0700 A few elements of the revamped project structure for WebKit2 were not quite right for the WinCairo build. This bug corrects these issues. 251497 1 61580 bfulgham 2010-07-14 16:10:23 -0700 Created attachment 61580 Fixes to build under WinCairo. 251915 2 bweinstein 2010-07-15 08:54:12 -0700 Not an official review (that'll be aroben or sfalken), but this looked good on my inspection. 252006 3 bfulgham 2010-07-15 11:22:06 -0700 Landed in http://trac.webkit.org/changeset/63438. 61580 2010-07-14 16:10:23 -0700 2010-07-15 09:56:43 -0700 Fixes to build under WinCairo. webkit2_wincairo.patch text/plain 12430 bfulgham SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MzM2MSkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDctMTQgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFBhdGNoIGZvciBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDIyOTkK KyAgICAgICAgQ29ycmVjdCBXaW5DYWlybyBidWlsZCBmb3IgbmV3IFdlYktpdDIgcHJvamVjdCBz dHJ1Y3R1cmUuCisKKyAgICAgICAgKiB3aW4vV2ViS2l0MkFwcGxlLnZzcHJvcHM6IFB1dCBXZWJL aXQyLmRlZiBoZXJlLgorICAgICAgICAqIHdpbi9XZWJLaXQyQ0ZMaXRlLmRlZjogQWRkZWQgQ0ZM aXRlIHZlcnNpb24gb2YgZGVmIGZpbGUuCisgICAgICAgICogd2luL1dlYktpdDJDRkxpdGUudnNw cm9wczogQWRkIG5ldyBXZWJLaXQyQ0ZMaXRlLmRlZiBoZXJlLgorICAgICAgICAqIHdpbi9XZWJL aXQyQ29tbW9uLnZzcHJvcHM6IFJlbW92ZSBXZWJLaXQyLmRlZiBkZWZpbml0aW9uIGFzCisgICAg ICAgICAgV2luQ2Fpcm8gYW5kIEFwcGxlIG5lZWQgZGlmZmVyZW50IHZlcnNpb25zIG9mIHRoaXMu CisgICAgICAgICogd2luL1dlYktpdDJXZWJQcm9jZXNzLnZjcHJvajogQWRkIGEgbmV3IERlYnVn X0NhaXJvIHRhcmdldAorICAgICAgICAgIGZvciB0aGUgV2ViS2l0MldlYlByb2Nlc3MgcHJvamVj dC4KKwogMjAxMC0wNy0xNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBXZWJLaXQyL3dpbi9XZWJL aXQyQXBwbGUudnNwcm9wcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL3dpbi9XZWJLaXQyQXBwbGUu dnNwcm9wcwkocmV2aXNpb24gNjMyNDcpCisrKyBXZWJLaXQyL3dpbi9XZWJLaXQyQXBwbGUudnNw cm9wcwkod29ya2luZyBjb3B5KQpAQCAtNyw2ICs3LDcgQEAKIAk8VG9vbA0KIAkJTmFtZT0iVkNM aW5rZXJUb29sIg0KIAkJQWRkaXRpb25hbERlcGVuZGVuY2llcz0iQ0ZOZXR3b3JrJChMaWJyYXJ5 Q29uZmlnU3VmZml4KS5saWIgQ29yZUZvdW5kYXRpb24kKExpYnJhcnlDb25maWdTdWZmaXgpLmxp YiBDb3JlR3JhcGhpY3MkKExpYnJhcnlDb25maWdTdWZmaXgpLmxpYiBRVE1vdmllV2luJChXZWJL aXRDb25maWdTdWZmaXgpLmxpYiBXZWJLaXRTeXN0ZW1JbnRlcmZhY2UkKFdlYktpdENvbmZpZ1N1 ZmZpeCkubGliIg0KKwkJTW9kdWxlRGVmaW5pdGlvbkZpbGU9IldlYktpdDIuZGVmIg0KIAkJRGVs YXlMb2FkRExMcz0iUVRNb3ZpZVdpbiQoV2ViS2l0Q29uZmlnU3VmZml4KS5kbGwiDQogCS8+DQog PC9WaXN1YWxTdHVkaW9Qcm9wZXJ0eVNoZWV0Pg0KSW5kZXg6IFdlYktpdDIvd2luL1dlYktpdDJD RkxpdGUuZGVmCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvd2luL1dlYktpdDJDRkxpdGUuZGVmCShy ZXZpc2lvbiAwKQorKysgV2ViS2l0Mi93aW4vV2ViS2l0MkNGTGl0ZS5kZWYJKHJldmlzaW9uIDAp CkBAIC0wLDAgKzEsMTI3IEBACitFWFBPUlRTCisgICAgICAgIERsbEdldENsYXNzT2JqZWN0ICAg UFJJVkFURQorICAgICAgICBEbGxDYW5VbmxvYWROb3cgICAgIFBSSVZBVEUKKyAgICAgICAgRGxs UmVnaXN0ZXJTZXJ2ZXIgICBQUklWQVRFCisgICAgICAgIERsbFVucmVnaXN0ZXJTZXJ2ZXIgUFJJ VkFURQorICAgICAgICBSdW5Bc0xvY2FsU2VydmVyICAgIFBSSVZBVEUKKyAgICAgICAgTG9jYWxT ZXJ2ZXJEaWREaWUgICBQUklWQVRFCisgICAgICAgIHNldFVzZU9wZW5Tb3VyY2VXZWJLaXQKKyAg ICAgICAgc2h1dERvd25XZWJLaXQKKyAgICAgICAgcHJvZ0lERm9yQ2xhc3MKKyAgICAgICAgV2Vi TG9jYWxpemVkU3RyaW5nVVRGOAorICAgICAgICBXZWJMb2NhbGl6ZWRMUENUU1RSVVRGOAorICAg ICAgICBXZWJLaXRDcmVhdGVJbnN0YW5jZQorCQkKKyAgICAgICAgOyBUaGVzZSBmdW5jdGlvbnMg YXJlIGRlcHJlY2F0ZWQKKyAgICAgICAgV2ViTG9jYWxpemVkU3RyaW5nCisgICAgICAgIFdlYkxv Y2FsaXplZExQQ1RTVFIKKyAgICAgICAgU2V0V2ViTG9jYWxpemVkU3RyaW5nTWFpbkJ1bmRsZQor CisJCTsgRGVwcmVjYXRlZCByZS1leHBvcnRzIGZyb20gSmF2YVNjcmlwdENvcmUKKyAgICAgICAg SlNDaGVja1NjcmlwdFN5bnRheAorICAgICAgICBKU0NsYXNzQ3JlYXRlCisgICAgICAgIEpTQ2xh c3NSZWxlYXNlCisgICAgICAgIEpTQ2xhc3NSZXRhaW4KKyAgICAgICAgSlNDb250ZXh0R2V0R2xv YmFsT2JqZWN0CisgICAgICAgIEpTQ29udGV4dEdldEdyb3VwCisgICAgICAgIEpTQ29udGV4dEdy b3VwQ3JlYXRlCisgICAgICAgIEpTQ29udGV4dEdyb3VwUmVsZWFzZQorICAgICAgICBKU0NvbnRl eHRHcm91cFJldGFpbgorICAgICAgICBKU0V2YWx1YXRlU2NyaXB0CisgICAgICAgIEpTR2FyYmFn ZUNvbGxlY3QKKyAgICAgICAgSlNHbG9iYWxDb250ZXh0Q3JlYXRlCisgICAgICAgIEpTR2xvYmFs Q29udGV4dENyZWF0ZUluR3JvdXAKKyAgICAgICAgSlNHbG9iYWxDb250ZXh0UmVsZWFzZQorICAg ICAgICBKU0dsb2JhbENvbnRleHRSZXRhaW4KKyAgICAgICAgSlNPYmplY3RDYWxsQXNDb25zdHJ1 Y3RvcgorICAgICAgICBKU09iamVjdENhbGxBc0Z1bmN0aW9uCisgICAgICAgIEpTT2JqZWN0Q29w eVByb3BlcnR5TmFtZXMKKyAgICAgICAgSlNPYmplY3REZWxldGVQcm9wZXJ0eQorICAgICAgICBK U09iamVjdEdldFByaXZhdGUKKyAgICAgICAgSlNPYmplY3RHZXRQcm9wZXJ0eQorICAgICAgICBK U09iamVjdEdldFByb3BlcnR5QXRJbmRleAorICAgICAgICBKU09iamVjdEdldFByb3RvdHlwZQor ICAgICAgICBKU09iamVjdEhhc1Byb3BlcnR5CisgICAgICAgIEpTT2JqZWN0SXNDb25zdHJ1Y3Rv cgorICAgICAgICBKU09iamVjdElzRnVuY3Rpb24KKyAgICAgICAgSlNPYmplY3RNYWtlCisgICAg ICAgIEpTT2JqZWN0TWFrZUFycmF5CisgICAgICAgIEpTT2JqZWN0TWFrZUNvbnN0cnVjdG9yCisg ICAgICAgIEpTT2JqZWN0TWFrZURhdGUKKyAgICAgICAgSlNPYmplY3RNYWtlRXJyb3IKKyAgICAg ICAgSlNPYmplY3RNYWtlRnVuY3Rpb24KKyAgICAgICAgSlNPYmplY3RNYWtlRnVuY3Rpb25XaXRo Q2FsbGJhY2sKKyAgICAgICAgSlNPYmplY3RNYWtlUmVnRXhwCisgICAgICAgIEpTT2JqZWN0U2V0 UHJpdmF0ZQorICAgICAgICBKU09iamVjdFNldFByb3BlcnR5CisgICAgICAgIEpTT2JqZWN0U2V0 UHJvcGVydHlBdEluZGV4CisgICAgICAgIEpTT2JqZWN0U2V0UHJvdG90eXBlCisgICAgICAgIEpT UHJvcGVydHlOYW1lQWNjdW11bGF0b3JBZGROYW1lCisgICAgICAgIEpTUHJvcGVydHlOYW1lQXJy YXlHZXRDb3VudAorICAgICAgICBKU1Byb3BlcnR5TmFtZUFycmF5R2V0TmFtZUF0SW5kZXgKKyAg ICAgICAgSlNQcm9wZXJ0eU5hbWVBcnJheVJlbGVhc2UKKyAgICAgICAgSlNQcm9wZXJ0eU5hbWVB cnJheVJldGFpbgorICAgICAgICBKU1N0cmluZ0NvcHlCU1RSCisgICAgICAgIEpTU3RyaW5nQ29w eUNGU3RyaW5nCisgICAgICAgIEpTU3RyaW5nQ3JlYXRlV2l0aEJTVFIKKyAgICAgICAgSlNTdHJp bmdDcmVhdGVXaXRoQ0ZTdHJpbmcKKyAgICAgICAgSlNTdHJpbmdDcmVhdGVXaXRoQ2hhcmFjdGVy cworICAgICAgICBKU1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZworICAgICAgICBKU1N0cmlu Z0dldENoYXJhY3RlcnNQdHIKKyAgICAgICAgSlNTdHJpbmdHZXRMZW5ndGgKKyAgICAgICAgSlNT dHJpbmdHZXRNYXhpbXVtVVRGOENTdHJpbmdTaXplCisgICAgICAgIEpTU3RyaW5nR2V0VVRGOENT dHJpbmcKKyAgICAgICAgSlNTdHJpbmdJc0VxdWFsCisgICAgICAgIEpTU3RyaW5nSXNFcXVhbFRv VVRGOENTdHJpbmcKKyAgICAgICAgSlNTdHJpbmdSZWxlYXNlCisgICAgICAgIEpTU3RyaW5nUmV0 YWluCisgICAgICAgIEpTVmFsdWVHZXRUeXBlCisgICAgICAgIEpTVmFsdWVJc0Jvb2xlYW4KKyAg ICAgICAgSlNWYWx1ZUlzRXF1YWwKKyAgICAgICAgSlNWYWx1ZUlzSW5zdGFuY2VPZkNvbnN0cnVj dG9yCisgICAgICAgIEpTVmFsdWVJc051bGwKKyAgICAgICAgSlNWYWx1ZUlzTnVtYmVyCisgICAg ICAgIEpTVmFsdWVJc09iamVjdAorICAgICAgICBKU1ZhbHVlSXNPYmplY3RPZkNsYXNzCisgICAg ICAgIEpTVmFsdWVJc1N0cmljdEVxdWFsCisgICAgICAgIEpTVmFsdWVJc1N0cmluZworICAgICAg ICBKU1ZhbHVlSXNVbmRlZmluZWQKKyAgICAgICAgSlNWYWx1ZU1ha2VCb29sZWFuCisgICAgICAg IEpTVmFsdWVNYWtlTnVsbAorICAgICAgICBKU1ZhbHVlTWFrZU51bWJlcgorICAgICAgICBKU1Zh bHVlTWFrZVN0cmluZworICAgICAgICBKU1ZhbHVlTWFrZVVuZGVmaW5lZAorICAgICAgICBKU1Zh bHVlUHJvdGVjdAorICAgICAgICBKU1ZhbHVlVG9Cb29sZWFuCisgICAgICAgIEpTVmFsdWVUb051 bWJlcgorICAgICAgICBKU1ZhbHVlVG9PYmplY3QKKyAgICAgICAgSlNWYWx1ZVRvU3RyaW5nQ29w eQorICAgICAgICBKU1ZhbHVlVW5wcm90ZWN0CisgICAgICAgID9mYXN0TWFsbG9jQFdURkBAWUFQ QVhJQFoKKyAgICAgICAgP2Zhc3RaZXJvZWRNYWxsb2NAV1RGQEBZQVBBWElAWgorICAgICAgICA/ ZmFzdEZyZWVAV1RGQEBZQVhQQVhAWgorICAgICAgICA/ZmFzdENhbGxvY0BXVEZAQFlBUEFYSUlA WgorICAgICAgICA/PzBNdXRleEBXVEZAQFFBRUBYWgorICAgICAgICA/PzBUaHJlYWRDb25kaXRp b25AV1RGQEBRQUVAWFoKKyAgICAgICAgPz8xTXV0ZXhAV1RGQEBRQUVAWFoKKyAgICAgICAgPz8x VGhyZWFkQ29uZGl0aW9uQFdURkBAUUFFQFhaCisgICAgICAgID9icm9hZGNhc3RAVGhyZWFkQ29u ZGl0aW9uQFdURkBAUUFFWFhaCisgICAgICAgID9jYWxsT25NYWluVGhyZWFkQFdURkBAWUFYUDZB WFBBWEBaMEBaCisgICAgICAgID9jcmVhdGVUaHJlYWRAV1RGQEBZQUlQNkFQQVhQQVhAWjBQQkRA WgorICAgICAgICA/Y3VycmVudFRocmVhZEBXVEZAQFlBSVhaCisgICAgICAgID9kZXRhY2hUaHJl YWRAV1RGQEBZQVhJQFoKKyAgICAgICAgP2luaXRpYWxpemVNYWluVGhyZWFkQFdURkBAWUFYWFoK KyAgICAgICAgP2luaXRpYWxpemVUaHJlYWRpbmdAV1RGQEBZQVhYWgorICAgICAgICA/aXNNYWlu VGhyZWFkQFdURkBAWUFfTlhaCisgICAgICAgID9sb2NrQE11dGV4QFdURkBAUUFFWFhaCisgICAg ICAgID9sb2NrQXRvbWljYWxseUluaXRpYWxpemVkU3RhdGljTXV0ZXhAV1RGQEBZQVhYWgorICAg ICAgICA/c2lnbmFsQFRocmVhZENvbmRpdGlvbkBXVEZAQFFBRVhYWgorICAgICAgICA/dGltZWRX YWl0QFRocmVhZENvbmRpdGlvbkBXVEZAQFFBRV9OQUFWTXV0ZXhAMkBOQFoKKyAgICAgICAgP3Rs c0tleUNvdW50QFdURkBAWUFBQUpYWgorICAgICAgICA/dGxzS2V5c0BXVEZAQFlBUEFLWFoKKyAg ICAgICAgP3RyeUxvY2tATXV0ZXhAV1RGQEBRQUVfTlhaCisgICAgICAgID91bmxvY2tATXV0ZXhA V1RGQEBRQUVYWFoKKyAgICAgICAgP3VubG9ja0F0b21pY2FsbHlJbml0aWFsaXplZFN0YXRpY011 dGV4QFdURkBAWUFYWFoKKyAgICAgICAgP3dhaXRAVGhyZWFkQ29uZGl0aW9uQFdURkBAUUFFWEFB Vk11dGV4QDJAQFoKKyAgICAgICAgP3dhaXRGb3JUaHJlYWRDb21wbGV0aW9uQFdURkBAWUFISVBB UEFYQFoKKyAgICAgICAgP2NyZWF0ZVRocmVhZEBXVEZAQFlBSVA2QVBBWFBBWEBaMEBaCkluZGV4 OiBXZWJLaXQyL3dpbi9XZWJLaXQyQ0ZMaXRlLnZzcHJvcHMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 Mi93aW4vV2ViS2l0MkNGTGl0ZS52c3Byb3BzCShyZXZpc2lvbiA2MzI0NykKKysrIFdlYktpdDIv d2luL1dlYktpdDJDRkxpdGUudnNwcm9wcwkod29ya2luZyBjb3B5KQpAQCAtNyw2ICs3LDcgQEAK IAk8VG9vbA0KIAkJTmFtZT0iVkNMaW5rZXJUb29sIg0KIAkJQWRkaXRpb25hbERlcGVuZGVuY2ll cz0iQ0ZMaXRlJChMaWJyYXJ5Q29uZmlnU3VmZml4KS5saWIiDQorCQlNb2R1bGVEZWZpbml0aW9u RmlsZT0iV2ViS2l0MkNGTGl0ZS5kZWYiDQogCQlBZGRpdGlvbmFsTGlicmFyeURpcmVjdG9yaWVz PSIiDQogCS8+DQogPC9WaXN1YWxTdHVkaW9Qcm9wZXJ0eVNoZWV0Pg0KSW5kZXg6IFdlYktpdDIv d2luL1dlYktpdDJDb21tb24udnNwcm9wcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL3dpbi9XZWJL aXQyQ29tbW9uLnZzcHJvcHMJKHJldmlzaW9uIDYzMjQ3KQorKysgV2ViS2l0Mi93aW4vV2ViS2l0 MkNvbW1vbi52c3Byb3BzCSh3b3JraW5nIGNvcHkpCkBAIC0xNyw3ICsxNyw2IEBACiAJCU5hbWU9 IlZDTGlua2VyVG9vbCINCiAJCUFkZGl0aW9uYWxEZXBlbmRlbmNpZXM9ImRlbGF5aW1wLmxpYiBr ZXJuZWwzMi5saWIgdXNlcjMyLmxpYiBnZGkzMi5saWIgYWR2YXBpMzIubGliIHNoZWxsMzIubGli IG9sZTMyLmxpYiBvbGVhdXQzMi5saWIgdXVpZC5saWIgb2RiYzMyLmxpYiBvZGJjY3AzMi5saWIg dXNwMTAubGliIGNvbWN0bDMyLmxpYiB2ZXJzaW9uLmxpYiBzaGx3YXBpLmxpYiBsaWJ4bWwyJChM aWJyYXJ5Q29uZmlnU3VmZml4KS5saWIgbGlieHNsdCQoTGlicmFyeUNvbmZpZ1N1ZmZpeCkubGli IGljdWluJChMaWJyYXJ5Q29uZmlnU3VmZml4KS5saWIgaWN1dWMkKExpYnJhcnlDb25maWdTdWZm aXgpLmxpYiBTUUxpdGUzJChMaWJyYXJ5Q29uZmlnU3VmZml4KS5saWIgcHRocmVhZFZDMiQoTGli cmFyeUNvbmZpZ1N1ZmZpeCkubGliIEphdmFTY3JpcHRDb3JlJChXZWJLaXRETExDb25maWdTdWZm aXgpLmxpYiBXZWJDb3JlJChXZWJLaXRDb25maWdTdWZmaXgpLmxpYiBXZWJLaXRMaWIkKFdlYktp dENvbmZpZ1N1ZmZpeCkubGliIFdlYktpdEdVSUQkKFdlYktpdENvbmZpZ1N1ZmZpeCkubGliIG1z aW1nMzIubGliIGNyeXB0MzIubGliIGlwaGxwYXBpLmxpYiB3aW5tbS5saWIgY29tc3VwcHcubGli IHJwY3J0NC5saWIiDQogCQlPdXRwdXRGaWxlPSIkKE91dERpcilcJChQcm9qZWN0TmFtZSkkKFdl YktpdERMTENvbmZpZ1N1ZmZpeCkuZGxsIg0KLQkJTW9kdWxlRGVmaW5pdGlvbkZpbGU9IldlYktp dDIuZGVmIg0KIAkJRGVsYXlMb2FkRExMcz0idXNwMTAuZGxsO2NvbWN0bDMyLmRsbDt2ZXJzaW9u LmRsbDtsaWJ4c2x0JChMaWJyYXJ5Q29uZmlnU3VmZml4KS5kbGw7U1FMaXRlMyQoTGlicmFyeUNv bmZpZ1N1ZmZpeCkuZGxsO21zaW1nMzIuZGxsO2lwaGxwYXBpLmRsbCINCiAJLz4NCiAJPFRvb2wN CkluZGV4OiBXZWJLaXQyL3dpbi9XZWJLaXQyV2ViUHJvY2Vzcy52Y3Byb2oKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0Mi93aW4vV2ViS2l0MldlYlByb2Nlc3MudmNwcm9qCShyZXZpc2lvbiA2MzI0NykK KysrIFdlYktpdDIvd2luL1dlYktpdDJXZWJQcm9jZXNzLnZjcHJvagkod29ya2luZyBjb3B5KQpA QCAtMjc5LDYgKzI3OSw3NCBAQAogCQkJCUNvbW1hbmRMaW5lPSJpZiBleGlzdCAmcXVvdDskKFdl YktpdE91dHB1dERpcilcYnVpbGRmYWlsZWQmcXVvdDsgZGVsICZxdW90OyQoV2ViS2l0T3V0cHV0 RGlyKVxidWlsZGZhaWxlZCZxdW90OyYjeDBEOyYjeDBBOyINCiAJCQkvPg0KIAkJPC9Db25maWd1 cmF0aW9uPg0KKwkJPENvbmZpZ3VyYXRpb24NCisJCQlOYW1lPSJEZWJ1Z19DRkxpdGV8V2luMzIi DQorCQkJT3V0cHV0RGlyZWN0b3J5PSIkKFNvbHV0aW9uRGlyKSQoQ29uZmlndXJhdGlvbk5hbWUp Ig0KKwkJCUludGVybWVkaWF0ZURpcmVjdG9yeT0iJChDb25maWd1cmF0aW9uTmFtZSkiDQorCQkJ Q29uZmlndXJhdGlvblR5cGU9IjEiDQorCQkJSW5oZXJpdGVkUHJvcGVydHlTaGVldHM9IiQoV2Vi S2l0TGlicmFyaWVzRGlyKVx0b29sc1x2c3Byb3BzXEZlYXR1cmVEZWZpbmVzLnZzcHJvcHM7JChX ZWJLaXRMaWJyYXJpZXNEaXIpXHRvb2xzXHZzcHJvcHNcY29tbW9uLnZzcHJvcHM7JChXZWJLaXRM aWJyYXJpZXNEaXIpXHRvb2xzXHZzcHJvcHNcZGVidWdfd2luY2Fpcm8udnNwcm9wcyINCisJCQlD aGFyYWN0ZXJTZXQ9IjEiDQorCQkJPg0KKwkJCTxUb29sDQorCQkJCU5hbWU9IlZDUHJlQnVpbGRF dmVudFRvb2wiDQorCQkJCUNvbW1hbmRMaW5lPSIlU3lzdGVtRHJpdmUlXGN5Z3dpblxiaW5cd2hp Y2guZXhlIGJhc2gmI3gwRDsmI3gwQTtpZiBlcnJvcmxldmVsIDEgc2V0IFBBVEg9JVN5c3RlbURy aXZlJVxjeWd3aW5cYmluOyVQQVRIJSYjeDBEOyYjeDBBO2NtZCAvYyYjeDBEOyYjeDBBO2lmIGV4 aXN0ICZxdW90OyQoV2ViS2l0T3V0cHV0RGlyKVxidWlsZGZhaWxlZCZxdW90OyBncmVwIFhYJChQ cm9qZWN0TmFtZSlYWCAmcXVvdDskKFdlYktpdE91dHB1dERpcilcYnVpbGRmYWlsZWQmcXVvdDsm I3gwRDsmI3gwQTtpZiBlcnJvcmxldmVsIDEgZXhpdCAxJiN4MEQ7JiN4MEE7ZWNobyBYWCQoUHJv amVjdE5hbWUpWFggJmd0OyAmcXVvdDskKFdlYktpdE91dHB1dERpcilcYnVpbGRmYWlsZWQmcXVv dDsmI3gwRDsmI3gwQTsmI3gwRDsmI3gwQTtiYXNoICZxdW90OyQoV2ViS2l0TGlicmFyaWVzRGly KVx0b29sc1xzY3JpcHRzXGF1dG8tdmVyc2lvbi5zaCZxdW90OyAmcXVvdDskKEludERpcikmcXVv dDsmI3gwRDsmI3gwQTsiDQorCQkJLz4NCisJCQk8VG9vbA0KKwkJCQlOYW1lPSJWQ0N1c3RvbUJ1 aWxkVG9vbCINCisJCQkvPg0KKwkJCTxUb29sDQorCQkJCU5hbWU9IlZDWE1MRGF0YUdlbmVyYXRv clRvb2wiDQorCQkJLz4NCisJCQk8VG9vbA0KKwkJCQlOYW1lPSJWQ1dlYlNlcnZpY2VQcm94eUdl bmVyYXRvclRvb2wiDQorCQkJLz4NCisJCQk8VG9vbA0KKwkJCQlOYW1lPSJWQ01JRExUb29sIg0K KwkJCS8+DQorCQkJPFRvb2wNCisJCQkJTmFtZT0iVkNDTENvbXBpbGVyVG9vbCINCisJCQkJQWRk aXRpb25hbEluY2x1ZGVEaXJlY3Rvcmllcz0iJnF1b3Q7JChQcm9qZWN0RGlyKVwuLlxXZWJQcm9j ZXNzXHdpbiZxdW90OyINCisJCQkvPg0KKwkJCTxUb29sDQorCQkJCU5hbWU9IlZDTWFuYWdlZFJl c291cmNlQ29tcGlsZXJUb29sIg0KKwkJCS8+DQorCQkJPFRvb2wNCisJCQkJTmFtZT0iVkNSZXNv dXJjZUNvbXBpbGVyVG9vbCINCisJCQkvPg0KKwkJCTxUb29sDQorCQkJCU5hbWU9IlZDUHJlTGlu a0V2ZW50VG9vbCINCisJCQkvPg0KKwkJCTxUb29sDQorCQkJCU5hbWU9IlZDTGlua2VyVG9vbCIN CisJCQkJQWRkaXRpb25hbE9wdGlvbnM9Ii9OWENPTVBBVCINCisJCQkJQWRkaXRpb25hbERlcGVu ZGVuY2llcz0iV2ViS2l0JChXZWJLaXRETExDb25maWdTdWZmaXgpLmxpYiINCisJCQkvPg0KKwkJ CTxUb29sDQorCQkJCU5hbWU9IlZDQUxpbmtUb29sIg0KKwkJCS8+DQorCQkJPFRvb2wNCisJCQkJ TmFtZT0iVkNNYW5pZmVzdFRvb2wiDQorCQkJLz4NCisJCQk8VG9vbA0KKwkJCQlOYW1lPSJWQ1hE Q01ha2VUb29sIg0KKwkJCS8+DQorCQkJPFRvb2wNCisJCQkJTmFtZT0iVkNCc2NNYWtlVG9vbCIN CisJCQkvPg0KKwkJCTxUb29sDQorCQkJCU5hbWU9IlZDRnhDb3BUb29sIg0KKwkJCS8+DQorCQkJ PFRvb2wNCisJCQkJTmFtZT0iVkNBcHBWZXJpZmllclRvb2wiDQorCQkJLz4NCisJCQk8VG9vbA0K KwkJCQlOYW1lPSJWQ1dlYkRlcGxveW1lbnRUb29sIg0KKwkJCS8+DQorCQkJPFRvb2wNCisJCQkJ TmFtZT0iVkNQb3N0QnVpbGRFdmVudFRvb2wiDQorCQkJCUNvbW1hbmRMaW5lPSJpZiBleGlzdCAm cXVvdDskKFdlYktpdE91dHB1dERpcilcYnVpbGRmYWlsZWQmcXVvdDsgZGVsICZxdW90OyQoV2Vi S2l0T3V0cHV0RGlyKVxidWlsZGZhaWxlZCZxdW90OyYjeDBEOyYjeDBBOyINCisJCQkvPg0KKwkJ PC9Db25maWd1cmF0aW9uPg0KIAk8L0NvbmZpZ3VyYXRpb25zPg0KIAk8UmVmZXJlbmNlcz4NCiAJ PC9SZWZlcmVuY2VzPg0KSW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC93aW4vQ2hhbmdlTG9nCShyZXZpc2lvbiA2MzM2MSkKKysrIFdlYktpdC93aW4vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDctMTQgIEJyZW50 IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhdGNoIGZvciBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDIyOTkKKyAgICAgICAgQ29ycmVjdCBXaW5DYWlybyBidWlsZCBm b3IgbmV3IFdlYktpdDIgcHJvamVjdCBzdHJ1Y3R1cmUuCisKKyAgICAgICAgKiBXZWJLaXQudmNw cm9qL1dlYktpdC5zbG46CisKIDIwMTAtMDctMTQgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYktpdC93aW4v V2ViS2l0LnZjcHJvai9XZWJLaXQuc2xuCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViS2l0 LnZjcHJvai9XZWJLaXQuc2xuCShyZXZpc2lvbiA2MzI0NykKKysrIFdlYktpdC93aW4vV2ViS2l0 LnZjcHJvai9XZWJLaXQuc2xuCSh3b3JraW5nIGNvcHkpCkBAIC0xODksNyArMTg5LDYgQEAgR2xv YmFsCiAJCXswQTMyNDM1Mi1CM0I2LTQ5NkMtOUU1Qi00QzdFOTIzRTYyOEJ9LlJlbGVhc2V8V2lu MzIuQWN0aXZlQ2ZnID0gYWxsfFdpbjMyDQogCQl7MEEzMjQzNTItQjNCNi00OTZDLTlFNUItNEM3 RTkyM0U2MjhCfS5SZWxlYXNlfFdpbjMyLkJ1aWxkLjAgPSBhbGx8V2luMzINCiAJCXtFNDk4Q0E5 RC0zQkQyLTRENTItOEUzNy1DOERDNzY1MjYzMjV9LkRlYnVnX0NhaXJvfFdpbjMyLkFjdGl2ZUNm ZyA9IERlYnVnfFdpbjMyDQotCQl7RTQ5OENBOUQtM0JEMi00RDUyLThFMzctQzhEQzc2NTI2MzI1 fS5EZWJ1Z19DYWlyb3xXaW4zMi5CdWlsZC4wID0gRGVidWd8V2luMzINCiAJCXtFNDk4Q0E5RC0z QkQyLTRENTItOEUzNy1DOERDNzY1MjYzMjV9LkRlYnVnX0ludGVybmFsfFdpbjMyLkFjdGl2ZUNm ZyA9IERlYnVnX0ludGVybmFsfFdpbjMyDQogCQl7RTQ5OENBOUQtM0JEMi00RDUyLThFMzctQzhE Qzc2NTI2MzI1fS5EZWJ1Z19JbnRlcm5hbHxXaW4zMi5CdWlsZC4wID0gRGVidWdfSW50ZXJuYWx8 V2luMzINCiAJCXtFNDk4Q0E5RC0zQkQyLTRENTItOEUzNy1DOERDNzY1MjYzMjV9LkRlYnVnfFdp bjMyLkFjdGl2ZUNmZyA9IERlYnVnfFdpbjMyDQpAQCAtMjI4LDggKzIyNyw4IEBAIEdsb2JhbAog CQl7MkVEQUQ2MzctQ0JBOC00RTU1LTk3RUQtN0QyQkJDMzM2RkRCfS5SZWxlYXNlX0NhaXJvfFdp bjMyLkJ1aWxkLjAgPSBhbGx8V2luMzINCiAJCXsyRURBRDYzNy1DQkE4LTRFNTUtOTdFRC03RDJC QkMzMzZGREJ9LlJlbGVhc2V8V2luMzIuQWN0aXZlQ2ZnID0gYWxsfFdpbjMyDQogCQl7MkVEQUQ2 MzctQ0JBOC00RTU1LTk3RUQtN0QyQkJDMzM2RkRCfS5SZWxlYXNlfFdpbjMyLkJ1aWxkLjAgPSBh bGx8V2luMzINCi0JCXtBQUU4OEZFRi01MDlFLTRENDktODcwQi03MzU3OTIyQzI3NkZ9LkRlYnVn X0NhaXJvfFdpbjMyLkFjdGl2ZUNmZyA9IERlYnVnfFdpbjMyDQotCQl7QUFFODhGRUYtNTA5RS00 RDQ5LTg3MEItNzM1NzkyMkMyNzZGfS5EZWJ1Z19DYWlyb3xXaW4zMi5CdWlsZC4wID0gRGVidWd8 V2luMzINCisJCXtBQUU4OEZFRi01MDlFLTRENDktODcwQi03MzU3OTIyQzI3NkZ9LkRlYnVnX0Nh aXJvfFdpbjMyLkFjdGl2ZUNmZyA9IERlYnVnX0NGTGl0ZXxXaW4zMg0KKwkJe0FBRTg4RkVGLTUw OUUtNEQ0OS04NzBCLTczNTc5MjJDMjc2Rn0uRGVidWdfQ2Fpcm98V2luMzIuQnVpbGQuMCA9IERl YnVnX0NGTGl0ZXxXaW4zMg0KIAkJe0FBRTg4RkVGLTUwOUUtNEQ0OS04NzBCLTczNTc5MjJDMjc2 Rn0uRGVidWdfSW50ZXJuYWx8V2luMzIuQWN0aXZlQ2ZnID0gRGVidWdfSW50ZXJuYWx8V2luMzIN CiAJCXtBQUU4OEZFRi01MDlFLTRENDktODcwQi03MzU3OTIyQzI3NkZ9LkRlYnVnX0ludGVybmFs fFdpbjMyLkJ1aWxkLjAgPSBEZWJ1Z19JbnRlcm5hbHxXaW4zMg0KIAkJe0FBRTg4RkVGLTUwOUUt NEQ0OS04NzBCLTczNTc5MjJDMjc2Rn0uRGVidWd8V2luMzIuQWN0aXZlQ2ZnID0gRGVidWd8V2lu MzINCg==