45140 2010-09-02 15:42:03 -0700 [Qt] V8 port for Qt platform: webkit project files changes 2010-09-11 11:24:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P3 Normal --- 45136 1 vladbph webkit-qt-unassigned christian.webkit hausmann kling oldest_to_newest 273625 0 vladbph 2010-09-02 15:42:03 -0700 Modify webkit project files to include V8 javascript engine. By default disabled. 273677 1 66431 vladbph 2010-09-02 17:04:34 -0700 Created attachment 66431 webkit project files changes 273743 2 66431 laszlo.gombos 2010-09-02 19:23:35 -0700 Comment on attachment 66431 webkit project files changes > Index: ChangeLog > =================================================================== > --- ChangeLog (revision 66692) > +++ ChangeLog (working copy) > @@ -1,3 +1,17 @@ > +2010-09-02 Vlad Burlik <volodimir.burlik@nokia.com> > + > + Reviewed by NOBODY (OOPS!). > + > + [Qt] V8 port for QT platform: webkit project files changes > + https://bugs.webkit.org/show_bug.cgi?id=45140 > + > + Modify webkit project files to include V8 javascript engine. > + By default disabled. > + > + * WebKit.pri: > + * WebKit.pro: > + * common.pri: > + > 2010-09-01 Ryuan Choi <ryuan.choi@samsung.com> > > Reviewed by Antonio Gomes. > Index: common.pri > =================================================================== > +QTJAVASCRIPTENGINE = $$(QTJAVASCRIPTENGINE) Looks good. > +QTJAVASCRIPTENGINEREV = $$(QTJAVASCRIPTENGINEREV) I think we should use V8_DIR instead. > > +contains(QTJAVASCRIPTENGINE, V8) { > + DEFINES *= V8_BINDING=1 > + DEFINES *= WTF_USE_V8=1 > + !win32-*:DEFINES += USING_V8_SHARED I think these defines are only needed by WebCore, so it should not be in common.pri. Move it to WebCore.pro. > Index: WebKit.pri > =================================================================== > --- WebKit.pri (revision 66692) > +++ WebKit.pri (working copy) > @@ -1,5 +1,19 @@ > # Include file to make it easy to include WebKit into Qt projects > > +# Include common.pri to determine JS engine > +include(common.pri) > + > +contains(QTJAVASCRIPTENGINE, V8) { > + unix:!symbian { > + DEFINES += WTF_CHANGES=1 > + V8_CFLAGS += -fno-strict-aliasing > + V8_CFLAGS += -fvisibility=hidden > + QMAKE_CFLAGS += $$V8_CFLAGS > + QMAKE_CXXFLAGS += $$V8_CFLAGS > + } > +} > + I do not think these are needed to build WebKit, remove them. > + > # Detect that we are building as a standalone package by the presence of > # either the generated files directory or as part of the Qt package through > # QTDIR_build > Index: WebKit.pro > =================================================================== > --- WebKit.pro (revision 66692) > +++ WebKit.pro (working copy) > @@ -14,7 +14,7 @@ > contains(QT_CONFIG, declarative) { > exists($$PWD/WebKit/qt/declarative): SUBDIRS += WebKit/qt/declarative > } > -exists($$PWD/JavaScriptCore/jsc.pro): SUBDIRS += JavaScriptCore/jsc.pro > +!contains(QTJAVASCRIPTENGINE, V8):exists($$PWD/JavaScriptCore/jsc.pro): SUBDIRS += JavaScriptCore/jsc.pro This part looks good. 273976 3 66510 vladbph 2010-09-03 09:29:36 -0700 Created attachment 66510 webkit project files changes Use JAVASCRIPT_ENGINE env. variable and V8_INCLUDE_DIR. 277751 4 67309 hausmann 2010-09-11 11:17:49 -0700 Created attachment 67309 Patch 277753 5 67309 kling 2010-09-11 11:20:49 -0700 Comment on attachment 67309 Patch r=me 277756 6 hausmann 2010-09-11 11:24:48 -0700 Committed r67307: <http://trac.webkit.org/changeset/67307> 66431 2010-09-02 17:04:34 -0700 2010-09-03 09:29:50 -0700 webkit project files changes v8_webkit_prx.patch text/plain 2868 vladbph SW5kZXg6IENoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIENoYW5nZUxvZwkocmV2aXNpb24gNjY2 OTIpDQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpDQpAQCAtMSwzICsxLDE3IEBADQorMjAx MC0wOS0wMiAgVmxhZCBCdXJsaWsgIDx2b2xvZGltaXIuYnVybGlrQG5va2lhLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFY4IHBvcnQg Zm9yIFFUIHBsYXRmb3JtOiB3ZWJraXQgcHJvamVjdCBmaWxlcyBjaGFuZ2VzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTE0MCAKKworICAgICAgICBN b2RpZnkgd2Via2l0IHByb2plY3QgZmlsZXMgdG8gaW5jbHVkZSBWOCBqYXZhc2NyaXB0IGVuZ2lu ZS4gCisgICAgICAgIEJ5IGRlZmF1bHQgZGlzYWJsZWQuCisKKyAgICAgICAgKiBXZWJLaXQucHJp OgorICAgICAgICAqIFdlYktpdC5wcm86CisgICAgICAgICogY29tbW9uLnByaToKKwogMjAxMC0w OS0wMSAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgQW50b25pbyBHb21lcy4KSW5kZXg6IGNvbW1vbi5wcmkNCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0t LSBjb21tb24ucHJpCShyZXZpc2lvbiA2NjY5MikNCisrKyBjb21tb24ucHJpCSh3b3JraW5nIGNv cHkpDQpAQCAtMSw1ICsxLDEzIEBADQogIyBjb21tb24gcHJvamVjdCBpbmNsdWRlIGZpbGUgZm9y IEphdmFTY3JpcHRDb3JlIGFuZCBXZWJDb3JlCiAKLWNvbnRhaW5zKEpBVkFTQ1JJUFRDT1JFX0pJ VCx5ZXMpOiBERUZJTkVTKz1FTkFCTEVfSklUPTEKLWNvbnRhaW5zKEpBVkFTQ1JJUFRDT1JFX0pJ VCxubyk6IERFRklORVMrPUVOQUJMRV9KSVQ9MAorUVRKQVZBU0NSSVBURU5HSU5FID0gJCQoUVRK QVZBU0NSSVBURU5HSU5FKQorUVRKQVZBU0NSSVBURU5HSU5FUkVWID0gJCQoUVRKQVZBU0NSSVBU RU5HSU5FUkVWKQogCitjb250YWlucyhRVEpBVkFTQ1JJUFRFTkdJTkUsIFY4KSB7CisgICAgREVG SU5FUyAqPSBWOF9CSU5ESU5HPTEKKyAgICBERUZJTkVTICo9IFdURl9VU0VfVjg9MQorICAgICF3 aW4zMi0qOkRFRklORVMgKz0gVVNJTkdfVjhfU0hBUkVECit9IGVsc2UgeworICAgIGNvbnRhaW5z KEpBVkFTQ1JJUFRDT1JFX0pJVCx5ZXMpOiBERUZJTkVTKz1FTkFCTEVfSklUPTEKKyAgICBjb250 YWlucyhKQVZBU0NSSVBUQ09SRV9KSVQsbm8pOiBERUZJTkVTKz1FTkFCTEVfSklUPTAKK30KSW5k ZXg6IFdlYktpdC5wcmkNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQucHJpCShyZXZpc2lvbiA2NjY5 MikNCisrKyBXZWJLaXQucHJpCSh3b3JraW5nIGNvcHkpDQpAQCAtMSw1ICsxLDE5IEBADQogIyBJ bmNsdWRlIGZpbGUgdG8gbWFrZSBpdCBlYXN5IHRvIGluY2x1ZGUgV2ViS2l0IGludG8gUXQgcHJv amVjdHMKIAorIyBJbmNsdWRlIGNvbW1vbi5wcmkgdG8gZGV0ZXJtaW5lIEpTIGVuZ2luZQoraW5j bHVkZShjb21tb24ucHJpKQorCitjb250YWlucyhRVEpBVkFTQ1JJUFRFTkdJTkUsIFY4KSB7Cisg ICAgdW5peDohc3ltYmlhbiB7CisgICAgICAgIERFRklORVMgKz0gV1RGX0NIQU5HRVM9MQorICAg ICAgICBWOF9DRkxBR1MgKz0gLWZuby1zdHJpY3QtYWxpYXNpbmcKKyAgICAgICAgVjhfQ0ZMQUdT ICs9IC1mdmlzaWJpbGl0eT1oaWRkZW4KKyAgICAgICAgUU1BS0VfQ0ZMQUdTICs9ICQkVjhfQ0ZM QUdTCisgICAgICAgIFFNQUtFX0NYWEZMQUdTICs9ICQkVjhfQ0ZMQUdTCisgICAgfQorfQorCisK ICMgRGV0ZWN0IHRoYXQgd2UgYXJlIGJ1aWxkaW5nIGFzIGEgc3RhbmRhbG9uZSBwYWNrYWdlIGJ5 IHRoZSBwcmVzZW5jZSBvZgogIyBlaXRoZXIgdGhlIGdlbmVyYXRlZCBmaWxlcyBkaXJlY3Rvcnkg b3IgYXMgcGFydCBvZiB0aGUgUXQgcGFja2FnZSB0aHJvdWdoCiAjIFFURElSX2J1aWxkCkluZGV4 OiBXZWJLaXQucHJvDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0LnBybwkocmV2aXNpb24gNjY2OTIp DQorKysgV2ViS2l0LnBybwkod29ya2luZyBjb3B5KQ0KQEAgLTE0LDcgKzE0LDcgQEANCiBjb250 YWlucyhRVF9DT05GSUcsIGRlY2xhcmF0aXZlKSB7CiAgICAgZXhpc3RzKCQkUFdEL1dlYktpdC9x dC9kZWNsYXJhdGl2ZSk6IFNVQkRJUlMgKz0gV2ViS2l0L3F0L2RlY2xhcmF0aXZlCiB9Ci1leGlz dHMoJCRQV0QvSmF2YVNjcmlwdENvcmUvanNjLnBybyk6IFNVQkRJUlMgKz0gSmF2YVNjcmlwdENv cmUvanNjLnBybworIWNvbnRhaW5zKFFUSkFWQVNDUklQVEVOR0lORSwgVjgpOmV4aXN0cygkJFBX RC9KYXZhU2NyaXB0Q29yZS9qc2MucHJvKTogU1VCRElSUyArPSBKYXZhU2NyaXB0Q29yZS9qc2Mu cHJvCiBleGlzdHMoJCRQV0QvV2ViS2l0L3F0L3Rlc3RzKTogU1VCRElSUyArPSBXZWJLaXQvcXQv dGVzdHMKIGV4aXN0cygkJFBXRC9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVu ZGVyVHJlZS5wcm8pOiBTVUJESVJTICs9IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1 bXBSZW5kZXJUcmVlLnBybwogZXhpc3RzKCQkUFdEL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVl L3F0L0ltYWdlRGlmZi5wcm8pOiBTVUJESVJTICs9IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVl L3F0L0ltYWdlRGlmZi5wcm8K 66510 2010-09-03 09:29:36 -0700 2010-09-11 11:17:43 -0700 webkit project files changes v8_webkit_prx.patch text/plain 2017 vladbph SW5kZXg6IENoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIENoYW5nZUxvZwkocmV2aXNpb24gNjY3 MzUpDQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpDQpAQCAtMSwzICsxLDE1IEBADQorMjAx MC0wOS0wMyAgVmxhZCBCdXJsaWsgIDx2b2xvZGltaXIuYnVybGlrQG5va2lhLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFY4IHBvcnQg Zm9yIFFUIHBsYXRmb3JtOiB3ZWJraXQgcHJvamVjdCBmaWxlcyBjaGFuZ2VzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTE0MAorCisgICAgICAgIE1v ZGlmeSB3ZWJraXQgcHJvamVjdCBmaWxlcyB0byBpbmNsdWRlIFY4IGphdmFzY3JpcHQgZW5naW5l LiBCeSBkZWZhdWx0IGRpc2FibGVkLgorCisgICAgICAgICogV2ViS2l0LnBybzoKKyAgICAgICAg KiBjb21tb24ucHJpOgorCiAyMDEwLTA5LTAyICBMdWNhcyBEZSBNYXJjaGkgIDxsdWNhcy5kZW1h cmNoaUBwcm9mdXNpb24ubW9iaT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbnRvbmlvIEdvbWVz LgpJbmRleDogY29tbW9uLnByaQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIGNvbW1vbi5wcmkJKHJldmlzaW9u IDY2NzM1KQ0KKysrIGNvbW1vbi5wcmkJKHdvcmtpbmcgY29weSkNCkBAIC0xLDUgKzEsOCBAQA0K LSMgY29tbW9uIHByb2plY3QgaW5jbHVkZSBmaWxlIGZvciBKYXZhU2NyaXB0Q29yZSBhbmQgV2Vi Q29yZQotCi1jb250YWlucyhKQVZBU0NSSVBUQ09SRV9KSVQseWVzKTogREVGSU5FUys9RU5BQkxF X0pJVD0xCi1jb250YWlucyhKQVZBU0NSSVBUQ09SRV9KSVQsbm8pOiBERUZJTkVTKz1FTkFCTEVf SklUPTAKLQorIyBjb21tb24gcHJvamVjdCBpbmNsdWRlIGZpbGUgZm9yIEphdmFTY3JpcHRDb3Jl IGFuZCBXZWJDb3JlDQorDQorSkFWQVNDUklQVF9FTkdJTkUgPSAkJChKQVZBU0NSSVBUX0VOR0lO RSkNCisNCishY29udGFpbnMoSkFWQVNDUklQVF9FTkdJTkUsIFY4KSB7DQorICAgIGNvbnRhaW5z KEpBVkFTQ1JJUFRDT1JFX0pJVCx5ZXMpOiBERUZJTkVTKz1FTkFCTEVfSklUPTENCisgICAgY29u dGFpbnMoSkFWQVNDUklQVENPUkVfSklULG5vKTogREVGSU5FUys9RU5BQkxFX0pJVD0wDQorfQ0K SW5kZXg6IFdlYktpdC5wcm8NCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQucHJvCShyZXZpc2lvbiA2 NjczNSkNCisrKyBXZWJLaXQucHJvCSh3b3JraW5nIGNvcHkpDQpAQCAtMTQsNyArMTQsNyBAQA0K IGNvbnRhaW5zKFFUX0NPTkZJRywgZGVjbGFyYXRpdmUpIHsKICAgICBleGlzdHMoJCRQV0QvV2Vi S2l0L3F0L2RlY2xhcmF0aXZlKTogU1VCRElSUyArPSBXZWJLaXQvcXQvZGVjbGFyYXRpdmUKIH0K LWV4aXN0cygkJFBXRC9KYXZhU2NyaXB0Q29yZS9qc2MucHJvKTogU1VCRElSUyArPSBKYXZhU2Ny aXB0Q29yZS9qc2MucHJvCishY29udGFpbnMoSkFWQVNDUklQVF9FTkdJTkUsIFY4KTpleGlzdHMo JCRQV0QvSmF2YVNjcmlwdENvcmUvanNjLnBybyk6IFNVQkRJUlMgKz0gSmF2YVNjcmlwdENvcmUv anNjLnBybwogZXhpc3RzKCQkUFdEL1dlYktpdC9xdC90ZXN0cyk6IFNVQkRJUlMgKz0gV2ViS2l0 L3F0L3Rlc3RzCiBleGlzdHMoJCRQV0QvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVt cFJlbmRlclRyZWUucHJvKTogU1VCRElSUyArPSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9x dC9EdW1wUmVuZGVyVHJlZS5wcm8KIGV4aXN0cygkJFBXRC9XZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9xdC9JbWFnZURpZmYucHJvKTogU1VCRElSUyArPSBXZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9xdC9JbWFnZURpZmYucHJvCg== 67309 2010-09-11 11:17:49 -0700 2010-09-11 11:20:48 -0700 Patch bug-45140-20100911201747.patch text/plain 2551 hausmann ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAyYzkzNjExMjA2MTg4MTE0 OGQwODBjYjI5MmIwMTRmNDVkMzQ2ZjM5Li5hMDY1OWNlYWJiZTcwNmI2ZjQzNWVlODYwM2MzNjA4 ZWU3MWMzZmExIDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTMgQEAKKzIwMTAtMDktMTEgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtRdF0gVjggcG9ydDogd2Via2l0IHByb2plY3QgZmlsZXMgY2hhbmdlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUxNDAKKworICAgICAgICAqIFdl YktpdC5wcm86IERvbid0IGNvbXBpbGUgSmF2YVNjcmlwdENvcmUgYW5kIGpzYyB3aGVuCisgICAg ICAgIGJ1aWxkaW5nIHdpdGggdjguCisKIDIwMTAtMDktMTEgIFhhbiBMb3BleiAgPHhsb3BlekBp Z2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4KZGlmZiAt LWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODI2ZGE2 NzZkODE1ODM0NmQxNzQyNjFiNDIyNWJjMWFjZTI1YTVkMC4uZmI5M2I4M2ZiODkyODE2NzUwYzEx MDhjOGRjYzE1MTUxNzdiMDE0YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMC0wOS0xMSAgU2ltb24gSGF1 c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBWOCBwb3J0OiB3ZWJraXQgcHJvamVjdCBm aWxlcyBjaGFuZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NTE0MAorCisgICAgICAgICogV2ViQ29yZS5wcm86IFJlbW92ZWQgdW5lY2Vzc2FyeSBj b21tb24ucHJpIGluY2x1c2lvbiBmcm9tIGVhcmxpZXIgcGF0Y2guCisKIDIwMTAtMDktMDMgIFZs YWQgQnVybGlrICA8dm9sb2RpbWlyLmJ1cmxpa0Bub2tpYS5jb20+LCBTaW1vbiBIYXVzbWFubiAg PHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFz IEtsaW5nLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9XZWJDb3JlLnBybyBiL1dlYkNvcmUvV2ViQ29y ZS5wcm8KaW5kZXggOGM2N2NlNjkyNWRjYThlOGEzZmE4MjY4ZTE5OGJlZWJjMmJhYzU2Yy4uNzE0 YjgxMDg5NjZhYzAzMmNlMmQwMDMzNTJhNTMzMjc4ZGQ5ZWIwZiAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9XZWJDb3JlLnBybworKysgYi9XZWJDb3JlL1dlYkNvcmUucHJvCkBAIC0xLDYgKzEsMyBAQAot IyBJbmNsdWRlIHRvIGRldGVybWluZSBKUyBlbmdpbmUKLWluY2x1ZGUoLi4vY29tbW9uLnByaSkK LQogIyBXZWJDb3JlIC0gcW1ha2UgYnVpbGQgaW5mbwogQ09ORklHICs9IGJ1aWxkaW5nLWxpYnMK IENPTkZJRyArPSBkZXBlbmRfaW5jbHVkZXBhdGgKZGlmZiAtLWdpdCBhL1dlYktpdC5wcm8gYi9X ZWJLaXQucHJvCmluZGV4IGRiMTAyYzRhOWFjYzBjMDEzOTgxOTdjNGQ0NTFlYTRkNTQzOGVjYTIu LjlmZDljMmVkZGQwODkyY2Q0OTAzNDYyMWM2MmMxOGNjZWIzYTE1MzkgMTAwNjQ0Ci0tLSBhL1dl YktpdC5wcm8KKysrIGIvV2ViS2l0LnBybwpAQCAtMyw3ICszLDcgQEAgQ09ORklHICs9IG9yZGVy ZWQKIAogaW5jbHVkZShXZWJLaXQucHJpKQogCi1TVUJESVJTICs9IEphdmFTY3JpcHRDb3JlCish djg6IFNVQkRJUlMgKz0gSmF2YVNjcmlwdENvcmUKIHdlYmtpdDIgewogICAgIFNVQkRJUlMgKz0g V2ViS2l0MgogfQpAQCAtMTQsNyArMTQsNyBAQCBleGlzdHMoJCRQV0QvV2ViS2l0VG9vbHMvUXRU ZXN0QnJvd3Nlcik6IFNVQkRJUlMgKz0gV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3NlcgogY29udGFp bnMoUVRfQ09ORklHLCBkZWNsYXJhdGl2ZSkgewogICAgIGV4aXN0cygkJFBXRC9XZWJLaXQvcXQv ZGVjbGFyYXRpdmUpOiBTVUJESVJTICs9IFdlYktpdC9xdC9kZWNsYXJhdGl2ZQogfQotZXhpc3Rz KCQkUFdEL0phdmFTY3JpcHRDb3JlL2pzYy5wcm8pOiBTVUJESVJTICs9IEphdmFTY3JpcHRDb3Jl L2pzYy5wcm8KKyF2ODpleGlzdHMoJCRQV0QvSmF2YVNjcmlwdENvcmUvanNjLnBybyk6IFNVQkRJ UlMgKz0gSmF2YVNjcmlwdENvcmUvanNjLnBybwogZXhpc3RzKCQkUFdEL1dlYktpdC9xdC90ZXN0 cyk6IFNVQkRJUlMgKz0gV2ViS2l0L3F0L3Rlc3RzCiBleGlzdHMoJCRQV0QvV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWUucHJvKTogU1VCRElSUyArPSBXZWJLaXRU b29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZS5wcm8KIGV4aXN0cygkJFBXRC9X ZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9JbWFnZURpZmYucHJvKTogU1VCRElSUyArPSBX ZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9JbWFnZURpZmYucHJvCg==