57017 2011-03-24 08:19:57 -0700 [Qt] Properly detect phonon include, and avoid double qtLibraryTarget() call 2011-03-31 12:30:50 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P1 Critical --- 0 kristian.amlie webkit-unassigned benjamin commit-queue oldest_to_newest 372818 0 kristian.amlie 2011-03-24 08:19:57 -0700 This is needed for Qt Modularization. 372819 1 86776 kristian.amlie 2011-03-24 08:23:58 -0700 Created attachment 86776 Properly-detect-phonon-include-and-avoid-double-qtLibraryTarget-call 372899 2 86776 benjamin 2011-03-24 10:27:45 -0700 Comment on attachment 86776 Properly-detect-phonon-include-and-avoid-double-qtLibraryTarget-call View in context: https://bugs.webkit.org/attachment.cgi?id=86776&action=review Why do you add the isEmpty(QT_SOURCE_TREE)? > Source/WebCore/ChangeLog:5 > + Properly detect phonon include, and avoid double qtLibraryTarget() call Unecessary, you just copied the bug title. > Source/WebKit/qt/ChangeLog:3 > + Reviewed by NOBODY (OOPS!). Unecessary, you just copied the bug title. 373395 3 kristian.amlie 2011-03-25 01:20:47 -0700 (In reply to comment #2) > (From update of attachment 86776 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=86776&action=review > > Why do you add the isEmpty(QT_SOURCE_TREE)? Because if the QtKernel sources are available (as indicated by the existence of QT_SOURCE_TREE), then qtLibraryTarget will already have been called from within qbase.pri. This can happen in the case where you build the modularized Qt modules in development mode, where the modules can see each others sources. If building for release, then this will not be the case, and the qtLibraryTarget needs to be called. Long term, the reliance on qbase.pri in QT_SOURCE_TREE should be removed, but this will be some additional work. 373396 4 86908 kristian.amlie 2011-03-25 01:25:08 -0700 Created attachment 86908 Properly-detect-phonon-include-and-avoid-double-qtLibraryTarget-call-v2 Fixed ChangeLogs. 375476 5 86908 menard 2011-03-29 10:27:20 -0700 Comment on attachment 86908 Properly-detect-phonon-include-and-avoid-double-qtLibraryTarget-call-v2 Sorry to be picky Kristian but the changelog is not properly filled :(. http://trac.webkit.org/wiki/QtWebKitContrib Tells you how to do it. In your case : Precede the short description with "[Qt]" if your patch is specific to the Qt port of WebKit. The bug link should be right under the description and then after the explanation comes with a . at the end of the sentence. Thanks for the patch though. 377103 6 87712 menard 2011-03-31 06:19:37 -0700 Created attachment 87712 Changelog fix. 377152 7 kristian.amlie 2011-03-31 07:53:15 -0700 Hey, sorry for the late response. I only just now got back to actual coding. :-P (In reply to comment #5) > (From update of attachment 86908 [details]) > Sorry to be picky Kristian but the changelog is not properly filled :(. > > http://trac.webkit.org/wiki/QtWebKitContrib > > Tells you how to do it. > > In your case : > Precede the short description with "[Qt]" if your patch is specific to the Qt port of WebKit. > The bug link should be right under the description and then after the explanation comes with a . at the end of the sentence. > > Thanks for the patch though. I guess I misinterpreted Benjamin's comment to mean "remove the bug description, and leave a standalone description". Thanks for fixing that though! 377380 8 commit-queue 2011-03-31 12:27:17 -0700 The commit-queue encountered the following flaky tests while processing attachment 87712: fast/workers/storage/use-same-database-in-page-and-workers.html bug 50995 (author: dumi@chromium.org) The commit-queue is continuing to process your patch. 377383 9 87712 commit-queue 2011-03-31 12:30:46 -0700 Comment on attachment 87712 Changelog fix. Clearing flags on attachment: 87712 Committed r82605: <http://trac.webkit.org/changeset/82605> 377384 10 commit-queue 2011-03-31 12:30:50 -0700 All reviewed patches have been landed. Closing bug. 86776 2011-03-24 08:23:58 -0700 2011-03-25 01:25:08 -0700 Properly-detect-phonon-include-and-avoid-double-qtLibraryTarget-call 0001-Properly-detect-phonon-include-and-avoid-double-qtLi.patch text/plain 2948 kristian.amlie RnJvbSAyZTYzNzdkMDBlZGYyY2U4MzBlZWVkNzVhMWU1Y2U1YmMwMTRlNTlkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpdXMgU3Rvcm0tT2xzZW4gPG1hcml1cy5zdG9ybS1vbHNl bkBub2tpYS5jb20+CkRhdGU6IFR1ZSwgMTUgRmViIDIwMTEgMTY6Mzc6MjAgLTA2MDAKU3ViamVj dDogW1BBVENIXSBQcm9wZXJseSBkZXRlY3QgcGhvbm9uIGluY2x1ZGUsIGFuZCBhdm9pZCBkb3Vi bGUgcXRMaWJyYXJ5VGFyZ2V0KCkgY2FsbAoKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg ICAgICB8ICAgMTMgKysrKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcmkgICAg fCAgICAyICstCiBTb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyAgICB8ICAgMTEgKysrKysrKysr KysKIFNvdXJjZS9XZWJLaXQvcXQvUXRXZWJLaXQucHJvIHwgICAgMiArLQogNCBmaWxlcyBjaGFu Z2VkLCAyNiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3NDNl MmQ5Li40Y2ViYzA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDMtMjQgIE1h cml1cyBTdG9ybS1PbHNlbiAgPG1hcml1cy5zdG9ybS1vbHNlbkBub2tpYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJvcGVybHkgZGV0ZWN0 IHBob25vbiBpbmNsdWRlLCBhbmQgYXZvaWQgZG91YmxlIHF0TGlicmFyeVRhcmdldCgpIGNhbGwK KworICAgICAgICBbUXRdIFByb3Blcmx5IGRldGVjdCBwaG9ub24gaW5jbHVkZSwgYW5kIGF2b2lk IGRvdWJsZSBxdExpYnJhcnlUYXJnZXQoKSBjYWxsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzAxNworCisgICAgICAgIEJ1aWxkIGZpeC4gTm8gbmV3 IHRlc3RzLgorCisgICAgICAgICogV2ViQ29yZS5wcmk6CisKIDIwMTEtMDMtMjQgIFByYXNhbnRo IFVsbGF0dGlsICA8cHJhc2FudGgudWxsYXR0aWxAbm9raWEuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5wcmkgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnByaQppbmRleCAzNjQ0MTg0Li5hZDliYWMy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnByaQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLnByaQpAQCAtMzAwLDcgKzMwMCw3IEBAIGNvbnRhaW5zIChDT05GSUcsIHRl eHRfYnJlYWtpbmdfd2l0aF9pY3UpIHsKICFDT05GSUcoUVRESVJfYnVpbGQpIHsKICAgICB3aW4z Mi0qfHdpbmNlKiB7CiAgICAgICAgIERMTERFU1RESVIgPSAkJE9VVFBVVF9ESVIvYmluCi0gICAg ICAgIGJ1aWxkX3Bhc3M6IFRBUkdFVCA9ICQkcXRMaWJyYXJ5VGFyZ2V0KCQkVEFSR0VUKQorICAg ICAgICBpc0VtcHR5KFFUX1NPVVJDRV9UUkVFKTpidWlsZF9wYXNzOiBUQVJHRVQgPSAkJHF0TGli cmFyeVRhcmdldCgkJFRBUkdFVCkKIAogICAgICAgICBkbGx0YXJnZXQuY29tbWFuZHMgPSAkKENP UFlfRklMRSkgJChERVNURElSX1RBUkdFVCkgJCRbUVRfSU5TVEFMTF9CSU5TXQogICAgICAgICBk bGx0YXJnZXQuQ09ORklHID0gbm9fcGF0aApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCAxZDg5OGFhLi42ZjRh NzUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDExLTAzLTI0ICBNYXJpdXMg U3Rvcm0tT2xzZW4gIDxtYXJpdXMuc3Rvcm0tb2xzZW5Abm9raWEuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByb3Blcmx5IGRldGVjdCBwaG9u b24gaW5jbHVkZSwgYW5kIGF2b2lkIGRvdWJsZSBxdExpYnJhcnlUYXJnZXQoKSBjYWxsCisKKyAg ICAgICAgW1F0XSBQcm9wZXJseSBkZXRlY3QgcGhvbm9uIGluY2x1ZGUsIGFuZCBhdm9pZCBkb3Vi bGUgcXRMaWJyYXJ5VGFyZ2V0KCkgY2FsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTcwMTcKKworICAgICAgICAqIFF0V2ViS2l0LnBybzoKKwogMjAx MS0wMy0yNCAgS3Jpc3RpYW4gQW1saWUgIDxrcmlzdGlhbi5hbWxpZUBub2tpYS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L3F0L1F0V2ViS2l0LnBybyBiL1NvdXJjZS9XZWJLaXQvcXQvUXRXZWJLaXQucHJvCmluZGV4 IDE2NTE4ZTAuLjdhMmVjNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvUXRXZWJLaXQu cHJvCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvUXRXZWJLaXQucHJvCkBAIC0zMDYsNyArMzA2LDcg QEAgY29udGFpbnMoREVGSU5FUywgRU5BQkxFX0dFT0xPQ0FUSU9OPTEpIHsKIAogICAgICAgICAg ICAgICAgIENPTkZJRyArPSBidWlsZF9hbGwKICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAg ICAgICAgICAgZGVidWdfYW5kX3JlbGVhc2U6VEFSR0VUID0gJCRxdExpYnJhcnlUYXJnZXQoJCRU QVJHRVQpCisgICAgICAgICAgICAgICAgaXNFbXB0eShRVF9TT1VSQ0VfVFJFRSk6ZGVidWdfYW5k X3JlbGVhc2U6VEFSR0VUID0gJCRxdExpYnJhcnlUYXJnZXQoJCRUQVJHRVQpCiAgICAgICAgICAg ICB9CiAKICAgICAgICAgICAgIENPTkZJRyArPSBsaWJfYnVuZGxlIHF0X25vX2ZyYW1ld29ya19k aXJlY3RfaW5jbHVkZXMgcXRfZnJhbWV3b3JrCi0tIAoxLjcuMy40Cgo= 86908 2011-03-25 01:25:08 -0700 2011-03-31 06:19:37 -0700 Properly-detect-phonon-include-and-avoid-double-qtLibraryTarget-call-v2 0001-Properly-detect-phonon-include-and-avoid-double-qtLi.patch text/plain 2774 kristian.amlie RnJvbSBkOWRmZTY3OTk0MDZmZTFjNjI5YTk5MGMwYTY4N2Q0MzQ1OTEzZjg5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpdXMgU3Rvcm0tT2xzZW4gPG1hcml1cy5zdG9ybS1vbHNl bkBub2tpYS5jb20+CkRhdGU6IFR1ZSwgMTUgRmViIDIwMTEgMTY6Mzc6MjAgLTA2MDAKU3ViamVj dDogW1BBVENIXSBQcm9wZXJseSBkZXRlY3QgcGhvbm9uIGluY2x1ZGUsIGFuZCBhdm9pZCBkb3Vi bGUgcXRMaWJyYXJ5VGFyZ2V0KCkgY2FsbAoKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg ICAgICB8ICAgMTIgKysrKysrKysrKysrCiBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnByaSAgICB8 ICAgIDIgKy0KIFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nICAgIHwgICAxMCArKysrKysrKysr CiBTb3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0LnBybyB8ICAgIDIgKy0KIDQgZmlsZXMgY2hhbmdl ZCwgMjQgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzQzZTJk OS4uNmZlZDE5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDExLTAzLTI0ICBNYXJp dXMgU3Rvcm0tT2xzZW4gIDxtYXJpdXMuc3Rvcm0tb2xzZW5Abm9raWEuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByb3Blcmx5IGRldGVjdCBw aG9ub24gaW5jbHVkZSwgYW5kIGF2b2lkIGRvdWJsZSBxdExpYnJhcnlUYXJnZXQoKSBjYWxsCisK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MDE3CisK KyAgICAgICAgQnVpbGQgZml4LiBObyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBXZWJDb3JlLnBy aToKKwogMjAxMS0wMy0yNCAgUHJhc2FudGggVWxsYXR0aWwgIDxwcmFzYW50aC51bGxhdHRpbEBu b2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnByaSBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu cHJpCmluZGV4IDM2NDQxODQuLmFkOWJhYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUucHJpCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUucHJpCkBAIC0zMDAsNyArMzAw LDcgQEAgY29udGFpbnMgKENPTkZJRywgdGV4dF9icmVha2luZ193aXRoX2ljdSkgewogIUNPTkZJ RyhRVERJUl9idWlsZCkgewogICAgIHdpbjMyLSp8d2luY2UqIHsKICAgICAgICAgRExMREVTVERJ UiA9ICQkT1VUUFVUX0RJUi9iaW4KLSAgICAgICAgYnVpbGRfcGFzczogVEFSR0VUID0gJCRxdExp YnJhcnlUYXJnZXQoJCRUQVJHRVQpCisgICAgICAgIGlzRW1wdHkoUVRfU09VUkNFX1RSRUUpOmJ1 aWxkX3Bhc3M6IFRBUkdFVCA9ICQkcXRMaWJyYXJ5VGFyZ2V0KCQkVEFSR0VUKQogCiAgICAgICAg IGRsbHRhcmdldC5jb21tYW5kcyA9ICQoQ09QWV9GSUxFKSAkKERFU1RESVJfVEFSR0VUKSAkJFtR VF9JTlNUQUxMX0JJTlNdCiAgICAgICAgIGRsbHRhcmdldC5DT05GSUcgPSBub19wYXRoCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hh bmdlTG9nCmluZGV4IDFkODk4YWEuLjIzMmQ5ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv cXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTMgQEAKKzIwMTEtMDMtMjQgIE1hcml1cyBTdG9ybS1PbHNlbiAgPG1hcml1cy5zdG9ybS1vbHNl bkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgUHJvcGVybHkgZGV0ZWN0IHBob25vbiBpbmNsdWRlLCBhbmQgYXZvaWQgZG91YmxlIHF0 TGlicmFyeVRhcmdldCgpIGNhbGwKKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTcwMTcKKworICAgICAgICAqIFF0V2ViS2l0LnBybzoKKwogMjAxMS0w My0yNCAgS3Jpc3RpYW4gQW1saWUgIDxrcmlzdGlhbi5hbWxpZUBub2tpYS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L3F0L1F0V2ViS2l0LnBybyBiL1NvdXJjZS9XZWJLaXQvcXQvUXRXZWJLaXQucHJvCmluZGV4IDE2 NTE4ZTAuLjdhMmVjNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvUXRXZWJLaXQucHJv CisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvUXRXZWJLaXQucHJvCkBAIC0zMDYsNyArMzA2LDcgQEAg Y29udGFpbnMoREVGSU5FUywgRU5BQkxFX0dFT0xPQ0FUSU9OPTEpIHsKIAogICAgICAgICAgICAg ICAgIENPTkZJRyArPSBidWlsZF9hbGwKICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAg ICAgICAgZGVidWdfYW5kX3JlbGVhc2U6VEFSR0VUID0gJCRxdExpYnJhcnlUYXJnZXQoJCRUQVJH RVQpCisgICAgICAgICAgICAgICAgaXNFbXB0eShRVF9TT1VSQ0VfVFJFRSk6ZGVidWdfYW5kX3Jl bGVhc2U6VEFSR0VUID0gJCRxdExpYnJhcnlUYXJnZXQoJCRUQVJHRVQpCiAgICAgICAgICAgICB9 CiAKICAgICAgICAgICAgIENPTkZJRyArPSBsaWJfYnVuZGxlIHF0X25vX2ZyYW1ld29ya19kaXJl Y3RfaW5jbHVkZXMgcXRfZnJhbWV3b3JrCi0tIAoxLjcuMy40Cgo= 87712 2011-03-31 06:19:37 -0700 2011-03-31 12:30:45 -0700 Changelog fix. test.diff text/plain 2278 menard ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkNDA2MjY1Li43MjM5Yzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTEtMDMtMzEgIE1hcml1cyBTdG9ybS1PbHNlbiAgPG1hcml1cy5zdG9ybS1vbHNlbkBu b2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW1F0XSBQcm9wZXJseSBkZXRlY3QgcGhvbm9uIGluY2x1ZGUsIGFuZCBhdm9pZCBkb3VibGUg cXRMaWJyYXJ5VGFyZ2V0KCkgY2FsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTcwMTcKKworICAgICAgICBCdWlsZCBmaXguIE5vIG5ldyB0ZXN0cy4K KworICAgICAgICAqIFdlYkNvcmUucHJpOgorCiAyMDExLTAzLTMxICBSZW5hdGEgSG9kb3ZhbiAg PHJlbmlAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaXJrIFNjaHVsemUuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnByaSBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUucHJpCmluZGV4IDM2NDQxODQuLmFkOWJhYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUucHJpCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUucHJpCkBAIC0zMDAs NyArMzAwLDcgQEAgY29udGFpbnMgKENPTkZJRywgdGV4dF9icmVha2luZ193aXRoX2ljdSkgewog IUNPTkZJRyhRVERJUl9idWlsZCkgewogICAgIHdpbjMyLSp8d2luY2UqIHsKICAgICAgICAgRExM REVTVERJUiA9ICQkT1VUUFVUX0RJUi9iaW4KLSAgICAgICAgYnVpbGRfcGFzczogVEFSR0VUID0g JCRxdExpYnJhcnlUYXJnZXQoJCRUQVJHRVQpCisgICAgICAgIGlzRW1wdHkoUVRfU09VUkNFX1RS RUUpOmJ1aWxkX3Bhc3M6IFRBUkdFVCA9ICQkcXRMaWJyYXJ5VGFyZ2V0KCQkVEFSR0VUKQogCiAg ICAgICAgIGRsbHRhcmdldC5jb21tYW5kcyA9ICQoQ09QWV9GSUxFKSAkKERFU1RESVJfVEFSR0VU KSAkJFtRVF9JTlNUQUxMX0JJTlNdCiAgICAgICAgIGRsbHRhcmdldC5DT05GSUcgPSBub19wYXRo CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv cXQvQ2hhbmdlTG9nCmluZGV4IDdiYWI2YTkuLmE2ODE5MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTQgQEAKKzIwMTEtMDMtMzEgIE1hcml1cyBTdG9ybS1PbHNlbiAgPG1hcml1cy5zdG9y bS1vbHNlbkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW1F0XSBQcm9wZXJseSBkZXRlY3QgcGhvbm9uIGluY2x1ZGUsIGFuZCBhdm9p ZCBkb3VibGUgcXRMaWJyYXJ5VGFyZ2V0KCkgY2FsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcwMTcKKworICAgICAgICBCdWlsZCBmaXguIE5vIG5l dyB0ZXN0cy4KKworICAgICAgICAqIFF0V2ViS2l0LnBybzoKKwogMjAxMS0wMy0zMCAgWWkgU2hl biAgPHlpLjQuc2hlbkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBS b2hkZSBDaHJpc3RpYW5zZW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0 LnBybyBiL1NvdXJjZS9XZWJLaXQvcXQvUXRXZWJLaXQucHJvCmluZGV4IDg4MzZjNGEuLjNjZjk5 OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvUXRXZWJLaXQucHJvCisrKyBiL1NvdXJj ZS9XZWJLaXQvcXQvUXRXZWJLaXQucHJvCkBAIC0zMjIsNyArMzIyLDcgQEAgY29udGFpbnMoQ09O RklHLCB0ZXhtYXApIHsKIAogICAgICAgICAgICAgICAgIENPTkZJRyArPSBidWlsZF9hbGwKICAg ICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgZGVidWdfYW5kX3JlbGVhc2U6VEFS R0VUID0gJCRxdExpYnJhcnlUYXJnZXQoJCRUQVJHRVQpCisgICAgICAgICAgICAgICAgaXNFbXB0 eShRVF9TT1VSQ0VfVFJFRSk6ZGVidWdfYW5kX3JlbGVhc2U6VEFSR0VUID0gJCRxdExpYnJhcnlU YXJnZXQoJCRUQVJHRVQpCiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIENPTkZJRyArPSBs aWJfYnVuZGxlIHF0X25vX2ZyYW1ld29ya19kaXJlY3RfaW5jbHVkZXMgcXRfZnJhbWV3b3JrCg==