27087 2009-07-08 12:05:11 -0700 Add New Configuration Flag for Redistributable Windows Build 2009-07-13 12:01:25 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 17484 1 bfulgham webkit-unassigned aroben oldest_to_newest 130480 0 bfulgham 2009-07-08 12:05:11 -0700 Modify the Visual Studio projects to use a new flag WIN_REDISTRIBUTABLE to signal that the build should use the Cairo/cURL/CFLite support rather than the standard Apple Windows libraries. This bug makes the following changes: 1. The WebCore/config.h checks for the WIN_REDISTRIBUTABLE flag, and uses Cairo/cURL/CFLite if present. 2. The WebKitTools/DumpRenderTree/config.h checks for the WIN_REDISTRIBUTABLE flag. 3. Modifies the WebCore.vcproj, WebKit.vcproj, and DumpRenderTree.vcproj files to define the flag for the Cairo builds. 130482 1 32465 bfulgham 2009-07-08 12:21:38 -0700 Created attachment 32465 Add WIN_REDISTRIBUTABLE flag for builds 130672 2 32465 aroben 2009-07-09 09:20:04 -0700 Comment on attachment 32465 Add WIN_REDISTRIBUTABLE flag for builds > + * WebCore.vcproj/WebCore.vcproj: Define WIN_REDISTRIBUTABLE for > + the Release_Cairo and Debug_Cairo targets. I think it would be better to make a WebCoreRedistributable.vsprops file and put the definition in there. We want to keep as much stuff out of the .vcproj as possible! The other code changes look fine. I'm not so sure about the WIN_REDISTRIBUTABLE name, though. It seems a bit too vague (not that the existing "WIN" name is any better!). Maybe we need a more "marketing-ish" name for this port? 131341 3 32664 bfulgham 2009-07-13 09:59:22 -0700 Created attachment 32664 Revise to use vsprops instead of project modifications. Use WIN_CAIRO label instead of WIN_REDISTRIBUTABLE. 131354 4 32664 aroben 2009-07-13 11:03:22 -0700 Comment on attachment 32664 Revise to use vsprops instead of project modifications. Use WIN_CAIRO label instead of WIN_REDISTRIBUTABLE. > +++ WebCore/WebCore.vcproj/WebCore.vcproj (working copy) > @@ -183,8 +183,9 @@ > </Configuration> > <Configuration > Name="Debug_Cairo|Win32" > + IntermediateDirectory="$(ConfigurationName)" I don't think you meant to add this. > +++ WebKit/win/ChangeLog (working copy) > @@ -1,3 +1,23 @@ > +2009-07-13 Brent Fulgham <bfulgham@webkit.org> > + > + Reviewed by NOBODY (OOPS!). > + > + Add new configuration flag for redistributable Windows build. > + https://bugs.webkit.org/show_bug.cgi=27087 > + > + * WebKit.vcproj/WebKit.vcproj: Add new WinCairo.vsprops to > + Debug_Cairo and Release_Cairo targets. > + > +2009-07-13 Brent Fulgham <bfulgham@webkit.org> > + > + Reviewed by NOBODY (OOPS!). > + > + Add new configuration flag for redistributable Windows build. > + https://bugs.webkit.org/show_bug.cgi=27087 > + > + * WebKit.vcproj/WebKit.vcproj: Add new WinCairo.vsprops to the > + Release_Cairo and Debug_Cairo targets. Double double! r=me 131367 5 bfulgham 2009-07-13 12:01:25 -0700 Landed in http://trac.webkit.org/changeset/45831. 32465 2009-07-08 12:21:38 -0700 2009-07-13 09:59:22 -0700 Add WIN_REDISTRIBUTABLE flag for builds redistributable.patch text/plain 10440 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NTYzMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDktMDctMDggIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZCBuZXcgY29uZmlndXJhdGlvbiBmbGFnIGZvciByZWRpc3RyaWJ1dGFibGUgV2luZG93cyBi dWlsZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpPTI3MDg3 CisKKyAgICAgICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvajogRGVmaW5lIFdJTl9S RURJU1RSSUJVVEFCTEUgZm9yCisgICAgICAgICAgdGhlIFJlbGVhc2VfQ2Fpcm8gYW5kIERlYnVn X0NhaXJvIHRhcmdldHMuCisgICAgICAgICogY29uZmlnLmg6IENoZWNrIGZvciBwcmVzZW5jZSBv ZiBXSU5fUkVESVNUUklCVVRBQkxFIGFuZCBzZWxlY3QKKyAgICAgICAgICBhcHByb3ByaWF0ZSBj b25maWd1cmF0aW9uLiAgRGVmYXVsdHMgdG8gc3RhbmRhcmQgQXBwbGUgYnVpbGQuCisKIDIwMDkt MDctMDggIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIEJ1 aWxkIGZpeDogQWRkIG1pc3NpbmcgI2luY2x1ZGVzIGZvciBXaW5kb3dzIChjVVJMKSBidWlsZC4K SW5kZXg6IFdlYkNvcmUvY29uZmlnLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9jb25maWcuaAko cmV2aXNpb24gNDU2MzApCisrKyBXZWJDb3JlL2NvbmZpZy5oCSh3b3JraW5nIGNvcHkpCkBAIC0x MDcsOSArMTA3LDIwIEBACiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKFdJTikKKyNpZiBkZWZpbmVk KFdJTl9SRURJU1RSSUJVVEFCTEUpCisjdW5kZWYgV1RGX1BMQVRGT1JNX0NHCisjZGVmaW5lIFdU Rl9QTEFURk9STV9DQUlSTyAxCisjdW5kZWYgV1RGX1VTRV9DRk5FVFdPUksKKyNkZWZpbmUgV1RG X1VTRV9DVVJMIDEKKyNpZm5kZWYgX1dJTlNPQ0tBUElfCisjZGVmaW5lIF9XSU5TT0NLQVBJXyAv LyBQcmV2ZW50IGluY2x1c2lvbiBvZiB3aW5zb2NrLmggaW4gd2luZG93cy5oCisjZW5kaWYKKyNl bHNlCiAjZGVmaW5lIFdURl9QTEFURk9STV9DRyAxCiAjdW5kZWYgV1RGX1BMQVRGT1JNX0NBSVJP CiAjZGVmaW5lIFdURl9VU0VfQ0ZORVRXT1JLIDEKKyN1bmRlZiBXVEZfVVNFX0NVUkwKKyNlbmRp ZgogI3VuZGVmIFdURl9VU0VfV0lOSU5FVAogI2RlZmluZSBXVEZfUExBVEZPUk1fQ0YgMQogI2Rl ZmluZSBXVEZfVVNFX1BUSFJFQURTIDAKSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2Vi Q29yZS52Y3Byb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3Jl LnZjcHJvagkocmV2aXNpb24gNDU2MzApCisrKyBXZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNv cmUudmNwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0yMDUsNiArMjA1LDcgQEAKIAkJCTxUb29sDQog CQkJCU5hbWU9IlZDQ0xDb21waWxlclRvb2wiDQogCQkJCUFkZGl0aW9uYWxJbmNsdWRlRGlyZWN0 b3JpZXM9IiINCisJCQkJUHJlcHJvY2Vzc29yRGVmaW5pdGlvbnM9IldJTl9SRURJU1RSSUJVVEFC TEU9MSINCiAJCQkJRm9yY2VkSW5jbHVkZUZpbGVzPSIiDQogCQkJLz4NCiAJCQk8VG9vbA0KQEAg LTI2MSw2ICsyNjIsNyBAQAogCQkJPFRvb2wNCiAJCQkJTmFtZT0iVkNDTENvbXBpbGVyVG9vbCIN CiAJCQkJQWRkaXRpb25hbEluY2x1ZGVEaXJlY3Rvcmllcz0iIg0KKwkJCQlQcmVwcm9jZXNzb3JE ZWZpbml0aW9ucz0iV0lOX1JFRElTVFJJQlVUQUJMRT0xIg0KIAkJCQlGb3JjZWRJbmNsdWRlRmls ZXM9IiINCiAJCQkvPg0KIAkJCTxUb29sDQpJbmRleDogV2ViS2l0L3dpbi9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ1NjMxKQorKysgV2Vi S2l0L3dpbi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAwOS0w Ny0wOCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG5ldyBjb25maWd1cmF0aW9u IGZsYWcgZm9yIHJlZGlzdHJpYnV0YWJsZSBXaW5kb3dzIGJ1aWxkLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k9MjcwODcKKworICAgICAgICAqIFdlYktpdC52 Y3Byb2ovV2ViS2l0LnZjcHJvajogRGVmaW5lIFdJTl9SRURJU1RSSUJVVEFCTEUgZm9yCisgICAg ICAgICAgdGhlIFJlbGVhc2VfQ2Fpcm8gYW5kIERlYnVnX0NhaXJvIHRhcmdldHMuCisKIDIwMDkt MDctMDcgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRGF2ZSBIeWF0dC4KSW5kZXg6IFdlYktpdC93aW4vV2ViS2l0LnZjcHJvai9XZWJLaXQudmNw cm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViS2l0LnZjcHJvai9XZWJLaXQudmNwcm9q CShyZXZpc2lvbiA0NTYzMCkKKysrIFdlYktpdC93aW4vV2ViS2l0LnZjcHJvai9XZWJLaXQudmNw cm9qCSh3b3JraW5nIGNvcHkpCkBAIC0yNjksNyArMjY5LDcgQEAKIAkJCTxUb29sDQogCQkJCU5h bWU9IlZDQ0xDb21waWxlclRvb2wiDQogCQkJCUFkZGl0aW9uYWxJbmNsdWRlRGlyZWN0b3JpZXM9 IiZxdW90OyQoV2ViS2l0T3V0cHV0RGlyKVxpbmNsdWRlXFdlYktpdCZxdW90OzsmcXVvdDskKFdl YktpdE91dHB1dERpcilcSW5jbHVkZSZxdW90OzsmcXVvdDskKFdlYktpdExpYnJhcmllc0Rpcilc SW5jbHVkZSZxdW90OzsmcXVvdDskKFdlYktpdE91dHB1dERpcilcSW5jbHVkZVxXZWJDb3JlJnF1 b3Q7OyZxdW90OyQoV2ViS2l0TGlicmFyaWVzRGlyKVxJbmNsdWRlXFdlYkNvcmUmcXVvdDs7JnF1 b3Q7JChXZWJLaXRPdXRwdXREaXIpXEluY2x1ZGVcV2ViQ29yZVxGb3J3YXJkaW5nSGVhZGVycyZx dW90OzsmcXVvdDskKFdlYktpdExpYnJhcmllc0RpcilcSW5jbHVkZVxXZWJDb3JlXEZvcndhcmRp bmdIZWFkZXJzJnF1b3Q7OyZxdW90OyQoV2ViS2l0T3V0cHV0RGlyKVxJbmNsdWRlXEphdmFTY3Jp cHRDb3JlJnF1b3Q7OyZxdW90OyQoV2ViS2l0TGlicmFyaWVzRGlyKVxJbmNsdWRlXEphdmFTY3Jp cHRDb3JlJnF1b3Q7OyZxdW90OyQoV2ViS2l0T3V0cHV0RGlyKVxJbmNsdWRlXGljdSZxdW90Ozsm cXVvdDskKFdlYktpdExpYnJhcmllc0RpcilcSW5jbHVkZVxpY3UmcXVvdDs7JnF1b3Q7JChXZWJL aXRMaWJyYXJpZXNEaXIpXGluY2x1ZGVccHRocmVhZHMmcXVvdDs7JnF1b3Q7JChXZWJLaXRPdXRw dXREaXIpXEluY2x1ZGVcQ29yZUZvdW5kYXRpb25cT1NYQ29tcGF0aWJpbGl0eUhlYWRlcnMmcXVv dDs7JnF1b3Q7JChXZWJLaXRMaWJyYXJpZXNEaXIpXEluY2x1ZGVcQ29yZUZvdW5kYXRpb25cT1NY Q29tcGF0aWJpbGl0eUhlYWRlcnMmcXVvdDs7JnF1b3Q7JChXZWJLaXRPdXRwdXREaXIpXEluY2x1 ZGVcQ29yZUZvdW5kYXRpb25cT1NYQ29tcGF0aWJpbGl0eUhlYWRlcnNcR05VQ29tcGF0aWJpbGl0 eSZxdW90OzsmcXVvdDskKFdlYktpdExpYnJhcmllc0RpcilcSW5jbHVkZVxDb3JlRm91bmRhdGlv blxPU1hDb21wYXRpYmlsaXR5SGVhZGVyc1xHTlVDb21wYXRpYmlsaXR5JnF1b3Q7OyZxdW90OyQo UHJvamVjdERpcilcLi4mcXVvdDs7JnF1b3Q7JChQcm9qZWN0RGlyKSZxdW90OzsmcXVvdDskKFBy b2plY3REaXIpXC4uXFdlYkNvcmVTdXBwb3J0JnF1b3Q7OyZxdW90OyQoSW50RGlyKVxpbmNsdWRl JnF1b3Q7OyZxdW90OyQoV2ViS2l0T3V0cHV0RGlyKVxvYmpcV2ViS2l0XERlcml2ZWRTb3VyY2Vz JnF1b3Q7Ig0KLQkJCQlQcmVwcm9jZXNzb3JEZWZpbml0aW9ucz0iX1VTUkRMTDtXRUJLSVRfRVhQ T1JUUztGUkFNRVdPUktfTkFNRT1XZWJLaXQ7RU5BQkxFX0RBVEFCQVNFO0VOQUJMRV9EQVRBR1JJ RDtFTkFCTEVfRE9NX1NUT1JBR0U7RU5BQkxFX0lDT05EQVRBQkFTRTtFTkFCTEVfT0ZGTElORV9X RUJfQVBQTElDQVRJT05TO0VOQUJMRV9TVkc7RU5BQkxFX1NWR19BTklNQVRJT047RU5BQkxFX1NW R19BU19JTUFHRTtFTkFCTEVfU1ZHX0ZPTlRTO0VOQUJMRV9TVkdfRk9SRUlHTl9PQkpFQ1Q7RU5B QkxFX1NWR19VU0U7RU5BQkxFX1dPUktFUlM7RU5BQkxFX1hQQVRIO0VOQUJMRV9YU0xUIg0KKwkJ CQlQcmVwcm9jZXNzb3JEZWZpbml0aW9ucz0iX1VTUkRMTDtXRUJLSVRfRVhQT1JUUztGUkFNRVdP UktfTkFNRT1XZWJLaXQ7RU5BQkxFX0RBVEFCQVNFO0VOQUJMRV9EQVRBR1JJRDtFTkFCTEVfRE9N X1NUT1JBR0U7RU5BQkxFX0lDT05EQVRBQkFTRTtFTkFCTEVfT0ZGTElORV9XRUJfQVBQTElDQVRJ T05TO0VOQUJMRV9TVkc7RU5BQkxFX1NWR19BTklNQVRJT047RU5BQkxFX1NWR19BU19JTUFHRTtF TkFCTEVfU1ZHX0ZPTlRTO0VOQUJMRV9TVkdfRk9SRUlHTl9PQkpFQ1Q7RU5BQkxFX1NWR19VU0U7 RU5BQkxFX1dPUktFUlM7RU5BQkxFX1hQQVRIO0VOQUJMRV9YU0xUO1dJTl9SRURJU1RSSUJVVEFC TEU9MSINCiAJCQkJVXNlUHJlY29tcGlsZWRIZWFkZXI9IjIiDQogCQkJCVByZWNvbXBpbGVkSGVh ZGVyVGhyb3VnaD0iV2ViS2l0UHJlZml4LmgiDQogCQkJCUZvcmNlZEluY2x1ZGVGaWxlcz0iV2Vi S2l0UHJlZml4LmgiDQpAQCAtMzQ4LDcgKzM0OCw3IEBACiAJCQk8VG9vbA0KIAkJCQlOYW1lPSJW Q0NMQ29tcGlsZXJUb29sIg0KIAkJCQlBZGRpdGlvbmFsSW5jbHVkZURpcmVjdG9yaWVzPSImcXVv dDskKFdlYktpdE91dHB1dERpcilcaW5jbHVkZVxXZWJLaXQmcXVvdDs7JnF1b3Q7JChXZWJLaXRP dXRwdXREaXIpXEluY2x1ZGUmcXVvdDs7JnF1b3Q7JChXZWJLaXRMaWJyYXJpZXNEaXIpXEluY2x1 ZGUmcXVvdDs7JnF1b3Q7JChXZWJLaXRPdXRwdXREaXIpXEluY2x1ZGVcV2ViQ29yZSZxdW90Ozsm cXVvdDskKFdlYktpdExpYnJhcmllc0RpcilcSW5jbHVkZVxXZWJDb3JlJnF1b3Q7OyZxdW90OyQo V2ViS2l0T3V0cHV0RGlyKVxJbmNsdWRlXFdlYkNvcmVcRm9yd2FyZGluZ0hlYWRlcnMmcXVvdDs7 JnF1b3Q7JChXZWJLaXRMaWJyYXJpZXNEaXIpXEluY2x1ZGVcV2ViQ29yZVxGb3J3YXJkaW5nSGVh ZGVycyZxdW90OzsmcXVvdDskKFdlYktpdE91dHB1dERpcilcSW5jbHVkZVxKYXZhU2NyaXB0Q29y ZSZxdW90OzsmcXVvdDskKFdlYktpdExpYnJhcmllc0RpcilcSW5jbHVkZVxKYXZhU2NyaXB0Q29y ZSZxdW90OzsmcXVvdDskKFdlYktpdE91dHB1dERpcilcSW5jbHVkZVxpY3UmcXVvdDs7JnF1b3Q7 JChXZWJLaXRMaWJyYXJpZXNEaXIpXEluY2x1ZGVcaWN1JnF1b3Q7OyZxdW90OyQoV2ViS2l0TGli cmFyaWVzRGlyKVxpbmNsdWRlXHB0aHJlYWRzJnF1b3Q7OyZxdW90OyQoV2ViS2l0T3V0cHV0RGly KVxJbmNsdWRlXENvcmVGb3VuZGF0aW9uXE9TWENvbXBhdGliaWxpdHlIZWFkZXJzJnF1b3Q7OyZx dW90OyQoV2ViS2l0TGlicmFyaWVzRGlyKVxJbmNsdWRlXENvcmVGb3VuZGF0aW9uXE9TWENvbXBh dGliaWxpdHlIZWFkZXJzJnF1b3Q7OyZxdW90OyQoV2ViS2l0T3V0cHV0RGlyKVxJbmNsdWRlXENv cmVGb3VuZGF0aW9uXE9TWENvbXBhdGliaWxpdHlIZWFkZXJzXEdOVUNvbXBhdGliaWxpdHkmcXVv dDs7JnF1b3Q7JChXZWJLaXRMaWJyYXJpZXNEaXIpXEluY2x1ZGVcQ29yZUZvdW5kYXRpb25cT1NY Q29tcGF0aWJpbGl0eUhlYWRlcnNcR05VQ29tcGF0aWJpbGl0eSZxdW90OzsmcXVvdDskKFByb2pl Y3REaXIpXC4uJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcikmcXVvdDs7JnF1b3Q7JChQcm9qZWN0 RGlyKVwuLlxXZWJDb3JlU3VwcG9ydCZxdW90OzsmcXVvdDskKEludERpcilcaW5jbHVkZSZxdW90 OzsmcXVvdDskKFdlYktpdE91dHB1dERpcilcb2JqXFdlYktpdFxEZXJpdmVkU291cmNlcyZxdW90 OyINCi0JCQkJUHJlcHJvY2Vzc29yRGVmaW5pdGlvbnM9Il9VU1JETEw7V0VCS0lUX0VYUE9SVFM7 RlJBTUVXT1JLX05BTUU9V2ViS2l0O0VOQUJMRV9EQVRBQkFTRTtFTkFCTEVfREFUQUdSSUQ7RU5B QkxFX0RPTV9TVE9SQUdFO0VOQUJMRV9JQ09OREFUQUJBU0U7RU5BQkxFX09GRkxJTkVfV0VCX0FQ UExJQ0FUSU9OUztFTkFCTEVfU1ZHO0VOQUJMRV9TVkdfQU5JTUFUSU9OO0VOQUJMRV9TVkdfQVNf SU1BR0U7RU5BQkxFX1NWR19GT05UUztFTkFCTEVfU1ZHX0ZPUkVJR05fT0JKRUNUO0VOQUJMRV9T VkdfVVNFO0VOQUJMRV9XT1JLRVJTO0VOQUJMRV9YUEFUSDtFTkFCTEVfWFNMVCINCisJCQkJUHJl cHJvY2Vzc29yRGVmaW5pdGlvbnM9Il9VU1JETEw7V0VCS0lUX0VYUE9SVFM7RlJBTUVXT1JLX05B TUU9V2ViS2l0O0VOQUJMRV9EQVRBQkFTRTtFTkFCTEVfREFUQUdSSUQ7RU5BQkxFX0RPTV9TVE9S QUdFO0VOQUJMRV9JQ09OREFUQUJBU0U7RU5BQkxFX09GRkxJTkVfV0VCX0FQUExJQ0FUSU9OUztF TkFCTEVfU1ZHO0VOQUJMRV9TVkdfQU5JTUFUSU9OO0VOQUJMRV9TVkdfQVNfSU1BR0U7RU5BQkxF X1NWR19GT05UUztFTkFCTEVfU1ZHX0ZPUkVJR05fT0JKRUNUO0VOQUJMRV9TVkdfVVNFO0VOQUJM RV9XT1JLRVJTO0VOQUJMRV9YUEFUSDtFTkFCTEVfWFNMVDtXSU5fUkVESVNUUklCVVRBQkxFPTEi DQogCQkJCVVzZVByZWNvbXBpbGVkSGVhZGVyPSIyIg0KIAkJCQlQcmVjb21waWxlZEhlYWRlclRo cm91Z2g9IldlYktpdFByZWZpeC5oIg0KIAkJCQlGb3JjZWRJbmNsdWRlRmlsZXM9IldlYktpdFBy ZWZpeC5oIg0KSW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXRUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ1NjMxKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDctMDggIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBuZXcgY29uZmlndXJhdGlvbiBmbGFnIGZvciByZWRp c3RyaWJ1dGFibGUgV2luZG93cyBidWlsZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpPTI3MDg3CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jb25maWcu aDogQ2hlY2sgZm9yIHByZXNlbmNlIG9mIFdJTl9SRVNJVFJJQlVUQUJMRQorICAgICAgICAgIGFu ZCBzZWxlY3QgYXBwcm9yaWF0ZSBzZXR0aW5ncy4gRGVmYXVsdHMgdG8gc3RhbmRhcmQgQXBwbGUg YnVpbGQuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLnZjcHJv ajogRGVmaW5lIFdJTl9SRURJU1RSSUJVVEFCTEUKKyAgICAgICAgICBmb3IgdGhlIFJlbGVhc2Vf Q2Fpcm8gYW5kIERlYnVnX0NhaXJvIHRhcmdldHMuCisKIDIwMDktMDctMDggIEJyZW50IEZ1bGdo YW0gIDxiZnVsZ2hhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIEJ1aWxkIGZpeCBmb3IgV2luZG93 cyBDYWlyby4KSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2NvbmZpZy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2NvbmZpZy5oCShyZXZpc2lvbiA0 NTYzMCkKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2NvbmZpZy5oCSh3b3JraW5nIGNv cHkpCkBAIC0zNiw3ICszNiwxMyBAQAogCiAjaWYgUExBVEZPUk0oV0lOKQogI2RlZmluZSBXVEZf UExBVEZPUk1fQ0YgMSAKKyNpZiBkZWZpbmVkKFdJTl9SRURJU1RSSUJVVEFCTEUpCisjZGVmaW5l IFdURl9QTEFURk9STV9DQUlSTyAxCisjZGVmaW5lIFdURl9VU0VfQ1VSTCAxCisjZWxzZQogI2Rl ZmluZSBXVEZfUExBVEZPUk1fQ0cgMQorI2RlZmluZSBXVEZfVVNFX0NGTkVUV09SSyAxCisjZW5k aWYKIAogI3VuZGVmIF9XSU4zMl9XSU5OVAogI2RlZmluZSBfV0lOMzJfV0lOTlQgMHgwNTAwCklu ZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUudmNwcm9q Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVuZGVy VHJlZS52Y3Byb2oJKHJldmlzaW9uIDQ1NjMwKQorKysgV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUvd2luL0R1bXBSZW5kZXJUcmVlLnZjcHJvagkod29ya2luZyBjb3B5KQpAQCAtMjU2LDcgKzI1 Niw3IEBACiAJCQk8VG9vbA0KIAkJCQlOYW1lPSJWQ0NMQ29tcGlsZXJUb29sIg0KIAkJCQlBZGRp dGlvbmFsSW5jbHVkZURpcmVjdG9yaWVzPSImcXVvdDskKFByb2plY3REaXIpXC4mcXVvdDs7JnF1 b3Q7JChQcm9qZWN0RGlyKVwuLiZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uXGNhaXJvJnF1 b3Q7OyZxdW90OyQoV2ViS2l0T3V0cHV0RGlyKVxJbmNsdWRlJnF1b3Q7OyZxdW90OyQoV2ViS2l0 T3V0cHV0RGlyKVxJbmNsdWRlXER1bXBSZW5kZXJUcmVlXEZvcndhcmRpbmdIZWFkZXJzJnF1b3Q7 OyZxdW90OyQoV2ViS2l0T3V0cHV0RGlyKVxJbmNsdWRlXEphdmFTY3JpcHRDb3JlJnF1b3Q7OyZx dW90OyQoV2ViS2l0TGlicmFyaWVzRGlyKVxJbmNsdWRlJnF1b3Q7OyZxdW90OyQoV2ViS2l0TGli cmFyaWVzRGlyKVxpbmNsdWRlXHB0aHJlYWRzJnF1b3Q7OyZxdW90OyQoV2ViS2l0T3V0cHV0RGly KVxJbmNsdWRlXFdlYkNvcmUmcXVvdDs7JnF1b3Q7JChXZWJLaXRMaWJyYXJpZXNEaXIpXEluY2x1 ZGVcV2ViQ29yZSZxdW90OzsmcXVvdDskKFdlYktpdExpYnJhcmllc0RpcilcSW5jbHVkZVxDb3Jl Rm91bmRhdGlvblxPU1hDb21wYXRpYmlsaXR5SGVhZGVycyZxdW90OzsmcXVvdDskKFdlYktpdExp YnJhcmllc0RpcilcSW5jbHVkZVxDb3JlRm91bmRhdGlvblxPU1hDb21wYXRpYmlsaXR5SGVhZGVy c1xHTlVDb21wYXRpYmlsaXR5JnF1b3Q7Ig0KLQkJCQlQcmVwcm9jZXNzb3JEZWZpbml0aW9ucz0i X0NPTlNPTEUiDQorCQkJCVByZXByb2Nlc3NvckRlZmluaXRpb25zPSJfQ09OU09MRTtXSU5fUkVE SVNUUklCVVRBQkxFPTEiDQogCQkJCURpc2FibGVTcGVjaWZpY1dhcm5pbmdzPSI0MTQ2Ig0KIAkJ CQlGb3JjZWRJbmNsdWRlRmlsZXM9IkR1bXBSZW5kZXJUcmVlUHJlZml4LmgiDQogCQkJLz4NCkBA IC0zMjksNyArMzI5LDcgQEAKIAkJCTxUb29sDQogCQkJCU5hbWU9IlZDQ0xDb21waWxlclRvb2wi DQogCQkJCUFkZGl0aW9uYWxJbmNsdWRlRGlyZWN0b3JpZXM9IiZxdW90OyQoUHJvamVjdERpcilc LiZxdW90OzsmcXVvdDskKFByb2plY3REaXIpXC4uJnF1b3Q7OyZxdW90OyQoUHJvamVjdERpcilc Li5cY2Fpcm8mcXVvdDs7JnF1b3Q7JChXZWJLaXRPdXRwdXREaXIpXEluY2x1ZGUmcXVvdDs7JnF1 b3Q7JChXZWJLaXRPdXRwdXREaXIpXEluY2x1ZGVcRHVtcFJlbmRlclRyZWVcRm9yd2FyZGluZ0hl YWRlcnMmcXVvdDs7JnF1b3Q7JChXZWJLaXRPdXRwdXREaXIpXEluY2x1ZGVcSmF2YVNjcmlwdENv cmUmcXVvdDs7JnF1b3Q7JChXZWJLaXRMaWJyYXJpZXNEaXIpXEluY2x1ZGUmcXVvdDs7JnF1b3Q7 JChXZWJLaXRMaWJyYXJpZXNEaXIpXGluY2x1ZGVccHRocmVhZHMmcXVvdDs7JnF1b3Q7JChXZWJL aXRPdXRwdXREaXIpXEluY2x1ZGVcV2ViQ29yZSZxdW90OzsmcXVvdDskKFdlYktpdExpYnJhcmll c0RpcilcSW5jbHVkZVxXZWJDb3JlJnF1b3Q7OyZxdW90OyQoV2ViS2l0TGlicmFyaWVzRGlyKVxJ bmNsdWRlXENvcmVGb3VuZGF0aW9uXE9TWENvbXBhdGliaWxpdHlIZWFkZXJzJnF1b3Q7OyZxdW90 OyQoV2ViS2l0TGlicmFyaWVzRGlyKVxJbmNsdWRlXENvcmVGb3VuZGF0aW9uXE9TWENvbXBhdGli aWxpdHlIZWFkZXJzXEdOVUNvbXBhdGliaWxpdHkmcXVvdDsiDQotCQkJCVByZXByb2Nlc3NvckRl ZmluaXRpb25zPSJfQ09OU09MRSINCisJCQkJUHJlcHJvY2Vzc29yRGVmaW5pdGlvbnM9Il9DT05T T0xFO1dJTl9SRURJU1RSSUJVVEFCTEU9MSINCiAJCQkJRGlzYWJsZVNwZWNpZmljV2FybmluZ3M9 IjQxNDYiDQogCQkJCUZvcmNlZEluY2x1ZGVGaWxlcz0iRHVtcFJlbmRlclRyZWVQcmVmaXguaCIN CiAJCQkvPg0K 32664 2009-07-13 09:59:22 -0700 2009-07-13 11:03:21 -0700 Revise to use vsprops instead of project modifications. Use WIN_CAIRO label instead of WIN_REDISTRIBUTABLE. win_cairo.patch text/plain 8949 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NTgyNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDktMDctMTMgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZCBuZXcgY29uZmlndXJhdGlvbiBmbGFnIGZvciByZWRpc3RyaWJ1dGFibGUgV2luZG93cyBi dWlsZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpPTI3MDg3 CisgICAgICAgIAorICAgICAgICAqIFdlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qOiBBZGQg bmV3IFdpbkNhaXJvLnZzcHJvcHMgdG8KKyAgICAgICAgICBEZWJ1Z19DYWlybyBhbmQgUmVsZWFz ZV9DYWlybyBidWlsZHMuCisgICAgICAgICogY29uZmlnLmg6IENoZWNrIGZvciBwcmVzZW5jZSBv ZiBXSU5fQ0FJUk8gYW5kIHNlbGVjdCBhcHByb3ByaWF0ZQorICAgICAgICAgIGNvbmZpZ3VyYXRp b24uICBEZWZhdWx0cyB0byBzdGFuZGFyZCBBcHBsZSBidWlsZC4KKwogMjAwOS0wNy0xMyAgRGlt aXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IERhcmluIEZpc2hlci4KSW5kZXg6IFdlYkNvcmUvY29uZmlnLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9jb25maWcuaAkocmV2aXNpb24gNDU2ODMpCisrKyBXZWJDb3JlL2NvbmZpZy5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xMDcsOSArMTA3LDIwIEBACiAjZW5kaWYKIAogI2lmIFBMQVRGT1JN KFdJTikKKyNpZiBkZWZpbmVkKFdJTl9DQUlSTykKKyN1bmRlZiBXVEZfUExBVEZPUk1fQ0cKKyNk ZWZpbmUgV1RGX1BMQVRGT1JNX0NBSVJPIDEKKyN1bmRlZiBXVEZfVVNFX0NGTkVUV09SSworI2Rl ZmluZSBXVEZfVVNFX0NVUkwgMQorI2lmbmRlZiBfV0lOU09DS0FQSV8KKyNkZWZpbmUgX1dJTlNP Q0tBUElfIC8vIFByZXZlbnQgaW5jbHVzaW9uIG9mIHdpbnNvY2suaCBpbiB3aW5kb3dzLmgKKyNl bmRpZgorI2Vsc2UKICNkZWZpbmUgV1RGX1BMQVRGT1JNX0NHIDEKICN1bmRlZiBXVEZfUExBVEZP Uk1fQ0FJUk8KICNkZWZpbmUgV1RGX1VTRV9DRk5FVFdPUksgMQorI3VuZGVmIFdURl9VU0VfQ1VS TAorI2VuZGlmCiAjdW5kZWYgV1RGX1VTRV9XSU5JTkVUCiAjZGVmaW5lIFdURl9QTEFURk9STV9D RiAxCiAjZGVmaW5lIFdURl9VU0VfUFRIUkVBRFMgMApJbmRleDogV2ViQ29yZS9XZWJDb3JlLnZj cHJvai9XZWJDb3JlLnZjcHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUudmNwcm9q L1dlYkNvcmUudmNwcm9qCShyZXZpc2lvbiA0NTY4MykKKysrIFdlYkNvcmUvV2ViQ29yZS52Y3By b2ovV2ViQ29yZS52Y3Byb2oJKHdvcmtpbmcgY29weSkKQEAgLTE4Myw4ICsxODMsOSBAQAogCQk8 L0NvbmZpZ3VyYXRpb24+DQogCQk8Q29uZmlndXJhdGlvbg0KIAkJCU5hbWU9IkRlYnVnX0NhaXJv fFdpbjMyIg0KKwkJCUludGVybWVkaWF0ZURpcmVjdG9yeT0iJChDb25maWd1cmF0aW9uTmFtZSki DQogCQkJQ29uZmlndXJhdGlvblR5cGU9IjQiDQotCQkJSW5oZXJpdGVkUHJvcGVydHlTaGVldHM9 IiQoV2ViS2l0TGlicmFyaWVzRGlyKVx0b29sc1x2c3Byb3BzXGNvbW1vbi52c3Byb3BzOyQoV2Vi S2l0TGlicmFyaWVzRGlyKVx0b29sc1x2c3Byb3BzXGRlYnVnLnZzcHJvcHM7LlxXZWJDb3JlQ29t bW9uLnZzcHJvcHM7LlxXZWJDb3JlQ2Fpcm8udnNwcm9wczsuXFdlYkNvcmVDVVJMLnZzcHJvcHMi DQorCQkJSW5oZXJpdGVkUHJvcGVydHlTaGVldHM9IiQoV2ViS2l0TGlicmFyaWVzRGlyKVx0b29s c1x2c3Byb3BzXGNvbW1vbi52c3Byb3BzOyQoV2ViS2l0TGlicmFyaWVzRGlyKVx0b29sc1x2c3By b3BzXGRlYnVnLnZzcHJvcHM7JChXZWJLaXRMaWJyYXJpZXNEaXIpXHRvb2xzXHZzcHJvcHNcV2lu Q2Fpcm8udnNwcm9wczsuXFdlYkNvcmVDb21tb24udnNwcm9wczsuXFdlYkNvcmVDYWlyby52c3By b3BzOy5cV2ViQ29yZUNVUkwudnNwcm9wcyINCiAJCQlDaGFyYWN0ZXJTZXQ9IjEiDQogCQkJPg0K IAkJCTxUb29sDQpAQCAtMjM5LDcgKzI0MCw3IEBACiAJCTxDb25maWd1cmF0aW9uDQogCQkJTmFt ZT0iUmVsZWFzZV9DYWlyb3xXaW4zMiINCiAJCQlDb25maWd1cmF0aW9uVHlwZT0iNCINCi0JCQlJ bmhlcml0ZWRQcm9wZXJ0eVNoZWV0cz0iJChXZWJLaXRMaWJyYXJpZXNEaXIpXHRvb2xzXHZzcHJv cHNcY29tbW9uLnZzcHJvcHM7JChXZWJLaXRMaWJyYXJpZXNEaXIpXHRvb2xzXHZzcHJvcHNccmVs ZWFzZS52c3Byb3BzOy5cV2ViQ29yZUNvbW1vbi52c3Byb3BzOy5cV2ViQ29yZUNhaXJvLnZzcHJv cHM7LlxXZWJDb3JlQ1VSTC52c3Byb3BzIg0KKwkJCUluaGVyaXRlZFByb3BlcnR5U2hlZXRzPSIk KFdlYktpdExpYnJhcmllc0RpcilcdG9vbHNcdnNwcm9wc1xjb21tb24udnNwcm9wczskKFdlYktp dExpYnJhcmllc0RpcilcdG9vbHNcdnNwcm9wc1xyZWxlYXNlLnZzcHJvcHM7JChXZWJLaXRMaWJy YXJpZXNEaXIpXHRvb2xzXHZzcHJvcHNcV2luQ2Fpcm8udnNwcm9wczsuXFdlYkNvcmVDb21tb24u dnNwcm9wczsuXFdlYkNvcmVDYWlyby52c3Byb3BzOy5cV2ViQ29yZUNVUkwudnNwcm9wcyINCiAJ CQlDaGFyYWN0ZXJTZXQ9IjEiDQogCQkJV2hvbGVQcm9ncmFtT3B0aW1pemF0aW9uPSIxIg0KIAkJ CT4NCkluZGV4OiBXZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd2lu L0NoYW5nZUxvZwkocmV2aXNpb24gNDU4MjcpCisrKyBXZWJLaXQvd2luL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDA5LTA3LTEzICBCcmVudCBGdWxnaGFtICA8 YmZ1bGdoYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGQgbmV3IGNvbmZpZ3VyYXRpb24gZmxhZyBmb3IgcmVkaXN0cmlidXRh YmxlIFdpbmRvd3MgYnVpbGQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT0yNzA4NworCisgICAgICAgICogV2ViS2l0LnZjcHJvai9XZWJLaXQudmNwcm9qOiBB ZGQgbmV3IFdpbkNhaXJvLnZzcHJvcHMgdG8KKyAgICAgICAgICBEZWJ1Z19DYWlybyBhbmQgUmVs ZWFzZV9DYWlybyB0YXJnZXRzLgorCisyMDA5LTA3LTEzICBCcmVudCBGdWxnaGFtICA8YmZ1bGdo YW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGQgbmV3IGNvbmZpZ3VyYXRpb24gZmxhZyBmb3IgcmVkaXN0cmlidXRhYmxlIFdp bmRvd3MgYnVpbGQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT0yNzA4NworCisgICAgICAgICogV2ViS2l0LnZjcHJvai9XZWJLaXQudmNwcm9qOiBBZGQgbmV3 IFdpbkNhaXJvLnZzcHJvcHMgdG8gdGhlCisgICAgICAgICAgUmVsZWFzZV9DYWlybyBhbmQgRGVi dWdfQ2Fpcm8gdGFyZ2V0cy4KKwogMjAwOS0wNy0xMiAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFt QGdtYWlsLmNvbT4KIAogICAgICAgICBTcGVjdWxhdGl2ZSBXaW5kb3dzIGJ1aWxkIGZpeCBhZnRl ciBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC80NTc4Ni4KSW5kZXg6IFdlYktpdC93 aW4vV2ViS2l0LnZjcHJvai9XZWJLaXQudmNwcm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4v V2ViS2l0LnZjcHJvai9XZWJLaXQudmNwcm9qCShyZXZpc2lvbiA0NTY4MykKKysrIFdlYktpdC93 aW4vV2ViS2l0LnZjcHJvai9XZWJLaXQudmNwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0yNDcsNyAr MjQ3LDcgQEAKIAkJCU91dHB1dERpcmVjdG9yeT0iJChXZWJLaXRPdXRwdXREaXIpXGJpbiINCiAJ CQlJbnRlcm1lZGlhdGVEaXJlY3Rvcnk9IiQoV2ViS2l0T3V0cHV0RGlyKVxvYmpcJChQcm9qZWN0 TmFtZSlcJChDb25maWd1cmF0aW9uTmFtZSkiDQogCQkJQ29uZmlndXJhdGlvblR5cGU9IjIiDQot CQkJSW5oZXJpdGVkUHJvcGVydHlTaGVldHM9IiQoV2ViS2l0TGlicmFyaWVzRGlyKVx0b29sc1x2 c3Byb3BzXGNvbW1vbi52c3Byb3BzOyQoV2ViS2l0TGlicmFyaWVzRGlyKVx0b29sc1x2c3Byb3Bz XGRlYnVnLnZzcHJvcHMiDQorCQkJSW5oZXJpdGVkUHJvcGVydHlTaGVldHM9IiQoV2ViS2l0TGli cmFyaWVzRGlyKVx0b29sc1x2c3Byb3BzXGNvbW1vbi52c3Byb3BzOyQoV2ViS2l0TGlicmFyaWVz RGlyKVx0b29sc1x2c3Byb3BzXGRlYnVnLnZzcHJvcHM7JChXZWJLaXRMaWJyYXJpZXNEaXIpXHRv b2xzXHZzcHJvcHNcV2luQ2Fpcm8udnNwcm9wcyINCiAJCQlDaGFyYWN0ZXJTZXQ9IjEiDQogCQkJ Pg0KIAkJCTxUb29sDQpAQCAtMzI1LDcgKzMyNSw3IEBACiAJCQlPdXRwdXREaXJlY3Rvcnk9IiQo V2ViS2l0T3V0cHV0RGlyKVxiaW4iDQogCQkJSW50ZXJtZWRpYXRlRGlyZWN0b3J5PSIkKFdlYktp dE91dHB1dERpcilcb2JqXCQoUHJvamVjdE5hbWUpXCQoQ29uZmlndXJhdGlvbk5hbWUpIg0KIAkJ CUNvbmZpZ3VyYXRpb25UeXBlPSIyIg0KLQkJCUluaGVyaXRlZFByb3BlcnR5U2hlZXRzPSIkKFdl YktpdExpYnJhcmllc0RpcilcdG9vbHNcdnNwcm9wc1xjb21tb24udnNwcm9wczskKFdlYktpdExp YnJhcmllc0RpcilcdG9vbHNcdnNwcm9wc1xyZWxlYXNlLnZzcHJvcHMiDQorCQkJSW5oZXJpdGVk UHJvcGVydHlTaGVldHM9IiQoV2ViS2l0TGlicmFyaWVzRGlyKVx0b29sc1x2c3Byb3BzXGNvbW1v bi52c3Byb3BzOyQoV2ViS2l0TGlicmFyaWVzRGlyKVx0b29sc1x2c3Byb3BzXHJlbGVhc2UudnNw cm9wczskKFdlYktpdExpYnJhcmllc0RpcilcdG9vbHNcdnNwcm9wc1xXaW5DYWlyby52c3Byb3Bz Ig0KIAkJCUNoYXJhY3RlclNldD0iMSINCiAJCQlXaG9sZVByb2dyYW1PcHRpbWl6YXRpb249IjEi DQogCQkJPg0KSW5kZXg6IFdlYktpdExpYnJhcmllcy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0TGlicmFyaWVzL0NoYW5nZUxvZwkocmV2aXNpb24gNDU4MjcpCisrKyBXZWJLaXRMaWJy YXJpZXMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDct MTMgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBuZXcgY29uZmlndXJhdGlvbiBm bGFnIGZvciByZWRpc3RyaWJ1dGFibGUgV2luZG93cyBidWlsZC4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpPTI3MDg3CisgICAgICAgIAorICAgICAgICAqIHdp bi90b29scy92c3Byb3BzL1dpbkNhaXJvLnZzcHJvcHM6IEFkZGVkLiAgRGVmaW5lcyB0aGUKKyAg ICAgICAgICBuZXcgV0lOX0NBSVJPIGZsYWcgdXNlZCB0byBkcml2ZSBub24tQXBwbGUgV2luZG93 cyBidWlsZC4KKwogMjAwOS0wNy0xMCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCkluZGV4OiBXZWJLaXRM aWJyYXJpZXMvd2luL3Rvb2xzL3ZzcHJvcHMvV2luQ2Fpcm8udnNwcm9wcwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXRMaWJyYXJpZXMvd2luL3Rvb2xzL3ZzcHJvcHMvV2luQ2Fpcm8udnNwcm9wcwkocmV2 aXNpb24gMCkKKysrIFdlYktpdExpYnJhcmllcy93aW4vdG9vbHMvdnNwcm9wcy9XaW5DYWlyby52 c3Byb3BzCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDExIEBACis8P3htbCB2ZXJzaW9uPSIxLjAi IGVuY29kaW5nPSJXaW5kb3dzLTEyNTIiPz4NCis8VmlzdWFsU3R1ZGlvUHJvcGVydHlTaGVldA0K KwlQcm9qZWN0VHlwZT0iVmlzdWFsIEMrKyINCisJVmVyc2lvbj0iOC4wMCINCisJTmFtZT0iV2lu Q2Fpcm8iDQorCT4NCisJPFRvb2wNCisJCU5hbWU9IlZDQ0xDb21waWxlclRvb2wiDQorCQlQcmVw cm9jZXNzb3JEZWZpbml0aW9ucz0iV0lOX0NBSVJPPTEiDQorCS8+DQorPC9WaXN1YWxTdHVkaW9Q cm9wZXJ0eVNoZWV0Pg0KSW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ1ODI3KQorKysgV2ViS2l0VG9vbHMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDctMTMgIEJy ZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBuZXcgY29uZmlndXJhdGlvbiBmbGFnIGZv ciByZWRpc3RyaWJ1dGFibGUgV2luZG93cyBidWlsZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpPTI3MDg3CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9j b25maWcuaDogQ2hlY2sgZm9yIHByZXNlbmNlIG9mIFdJTl9DQUlSTyBhbmQKKyAgICAgICAgICBz ZWxlY3QgYXBwcm9wcmlhdGUgY29uZmlndXJhdGlvbi4gRGVmYXVsdHMgdG8gc3RhbmRhcmQgQXBw bGUgYnVpbGQuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLnZj cHJvajogQWRkIG5ldyBXaW5DYWlyby52c3Byb3BzCisgICAgICAgICAgdG8gRGVidWdfQ2Fpcm8g YW5kIFJlbGVhc2VfQ2Fpcm8gdGFyZ2V0cy4KKwogMjAwOS0wNy0xMyAgU2ltb24gSGF1c21hbm4g IDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQXJpeWEg SGlkYXlhdC4KSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2NvbmZpZy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2NvbmZpZy5oCShyZXZpc2lvbiA0 NTY4MykKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2NvbmZpZy5oCSh3b3JraW5nIGNv cHkpCkBAIC0zNiw3ICszNiwxMyBAQAogCiAjaWYgUExBVEZPUk0oV0lOKQogI2RlZmluZSBXVEZf UExBVEZPUk1fQ0YgMSAKKyNpZiBkZWZpbmVkKFdJTl9DQUlSTykKKyNkZWZpbmUgV1RGX1BMQVRG T1JNX0NBSVJPIDEKKyNkZWZpbmUgV1RGX1VTRV9DVVJMIDEKKyNlbHNlCiAjZGVmaW5lIFdURl9Q TEFURk9STV9DRyAxCisjZGVmaW5lIFdURl9VU0VfQ0ZORVRXT1JLIDEKKyNlbmRpZgogCiAjdW5k ZWYgX1dJTjMyX1dJTk5UCiAjZGVmaW5lIF9XSU4zMl9XSU5OVCAweDA1MDAKSW5kZXg6IFdlYktp dFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVuZGVyVHJlZS52Y3Byb2oKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLnZjcHJv agkocmV2aXNpb24gNDU2ODMpCisrKyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVt cFJlbmRlclRyZWUudmNwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0yMzQsNyArMjM0LDcgQEAKIAkJ PENvbmZpZ3VyYXRpb24NCiAJCQlOYW1lPSJEZWJ1Z19DYWlyb3xXaW4zMiINCiAJCQlDb25maWd1 cmF0aW9uVHlwZT0iMSINCi0JCQlJbmhlcml0ZWRQcm9wZXJ0eVNoZWV0cz0iJChXZWJLaXRMaWJy YXJpZXNEaXIpXHRvb2xzXHZzcHJvcHNcY29tbW9uLnZzcHJvcHM7JChXZWJLaXRMaWJyYXJpZXNE aXIpXHRvb2xzXHZzcHJvcHNcZGVidWcudnNwcm9wcyINCisJCQlJbmhlcml0ZWRQcm9wZXJ0eVNo ZWV0cz0iJChXZWJLaXRMaWJyYXJpZXNEaXIpXHRvb2xzXHZzcHJvcHNcY29tbW9uLnZzcHJvcHM7 JChXZWJLaXRMaWJyYXJpZXNEaXIpXHRvb2xzXHZzcHJvcHNcZGVidWcudnNwcm9wczskKFdlYktp dExpYnJhcmllc0RpcilcdG9vbHNcdnNwcm9wc1xXaW5DYWlyby52c3Byb3BzIg0KIAkJCUNoYXJh Y3RlclNldD0iMSINCiAJCQk+DQogCQkJPFRvb2wNCkBAIC0zMDYsNyArMzA2LDcgQEAKIAkJPENv bmZpZ3VyYXRpb24NCiAJCQlOYW1lPSJSZWxlYXNlX0NhaXJvfFdpbjMyIg0KIAkJCUNvbmZpZ3Vy YXRpb25UeXBlPSIxIg0KLQkJCUluaGVyaXRlZFByb3BlcnR5U2hlZXRzPSIkKFdlYktpdExpYnJh cmllc0RpcilcdG9vbHNcdnNwcm9wc1xjb21tb24udnNwcm9wczskKFdlYktpdExpYnJhcmllc0Rp cilcdG9vbHNcdnNwcm9wc1xyZWxlYXNlLnZzcHJvcHMiDQorCQkJSW5oZXJpdGVkUHJvcGVydHlT aGVldHM9IiQoV2ViS2l0TGlicmFyaWVzRGlyKVx0b29sc1x2c3Byb3BzXGNvbW1vbi52c3Byb3Bz OyQoV2ViS2l0TGlicmFyaWVzRGlyKVx0b29sc1x2c3Byb3BzXHJlbGVhc2UudnNwcm9wczskKFdl YktpdExpYnJhcmllc0RpcilcdG9vbHNcdnNwcm9wc1xXaW5DYWlyby52c3Byb3BzIg0KIAkJCUNo YXJhY3RlclNldD0iMSINCiAJCQlXaG9sZVByb2dyYW1PcHRpbWl6YXRpb249IjEiDQogCQkJPg0K