209278 2020-03-19 06:31:37 -0700 [GTK][WPE] REGRESSION(r258626): flatpak is used even when WEBKIT_JHBUILD is set 2020-03-19 07:03:57 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk, Regression P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply ews-watchlist jbedard pnormand oldest_to_newest 1631625 0 cgarcia 2020-03-19 06:31:37 -0700 This happens when using an external jhbuild as I do. 1631627 1 393972 cgarcia 2020-03-19 06:33:39 -0700 Created attachment 393972 Patch 1631630 2 393972 pnormand 2020-03-19 06:50:06 -0700 Comment on attachment 393972 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393972&action=review > Tools/ChangeLog:9 > + This happens when using an external jhbuild, because shouldUseFlatpak() assumes that no command prefix always > + means flatpak. What's failing exactly? > Tools/Scripts/webkitdirs.pm:2176 > + if (defined $ENV{'WEBKIT_JHBUILD'}) { The env var value should be checked. 1631633 3 393973 cgarcia 2020-03-19 06:58:59 -0700 Created attachment 393973 Patch 1631635 4 cgarcia 2020-03-19 07:03:57 -0700 Committed r258695: <https://trac.webkit.org/changeset/258695> 393972 2020-03-19 06:33:39 -0700 2020-03-19 06:58:59 -0700 Patch wk-jhbuild.diff text/plain 1197 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4Zjdk NWJhZDM1NS4uMWYzOWZlYjNjYjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0wMy0xOSAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bV1BFXSBSRUdS RVNTSU9OKHIyNTg2MjYpOiBmbGF0cGFrIGlzIHVzZWQgZXZlbiB3aGVuIFdFQktJVF9KSEJVSUxE IGlzIHNldAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjA5Mjc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhpcyBoYXBwZW5zIHdoZW4gdXNpbmcgYW4gZXh0ZXJuYWwgamhidWlsZCwgYmVjYXVzZSBzaG91 bGRVc2VGbGF0cGFrKCkgYXNzdW1lcyB0aGF0IG5vIGNvbW1hbmQgcHJlZml4IGFsd2F5cworICAg ICAgICBtZWFucyBmbGF0cGFrLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgor ICAgICAgICAoc2hvdWxkVXNlRmxhdHBhayk6IFJldHVybiBlYXJseSBpZiBXRUJLSVRfSkhCVUlM RCBpcyBzZXQuCisKIDIwMjAtMDMtMTggIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI1ODYyNik6IHdlYmtpdC1kaXJzIHdhcm5p bmcKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQppbmRleCBhNjU3N2ZjZDYyZS4uZTYzM2QzMGVjNDUgMTAwNzU1Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dGRpcnMucG0KQEAgLTIxNzMsNiArMjE3MywxMCBAQCBzdWIgc2hvdWxkVXNlRmxhdHBhaygpCiAg ICAgICAgIHJldHVybiAwOwogICAgIH0KIAorICAgIGlmIChkZWZpbmVkICRFTlZ7J1dFQktJVF9K SEJVSUxEJ30pIHsKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQorCiAgICAgbXkgQHByZWZpeCA9 IHdyYXBwZXJQcmVmaXhJZk5lZWRlZCgpOwogICAgIHJldHVybiAoKCEgaW5GbGF0cGFrU2FuZGJv eCgpKSBhbmQgKEBwcmVmaXggPT0gMCkgYW5kIC1lIGdldFVzZXJGbGF0cGFrUGF0aCgpKTsKIH0K 393973 2020-03-19 06:58:59 -0700 2020-03-19 07:01:58 -0700 Patch wk-jhbuild.diff text/plain 1223 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4Zjdk NWJhZDM1NS4uMWYzOWZlYjNjYjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0wMy0xOSAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bV1BFXSBSRUdS RVNTSU9OKHIyNTg2MjYpOiBmbGF0cGFrIGlzIHVzZWQgZXZlbiB3aGVuIFdFQktJVF9KSEJVSUxE IGlzIHNldAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjA5Mjc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhpcyBoYXBwZW5zIHdoZW4gdXNpbmcgYW4gZXh0ZXJuYWwgamhidWlsZCwgYmVjYXVzZSBzaG91 bGRVc2VGbGF0cGFrKCkgYXNzdW1lcyB0aGF0IG5vIGNvbW1hbmQgcHJlZml4IGFsd2F5cworICAg ICAgICBtZWFucyBmbGF0cGFrLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgor ICAgICAgICAoc2hvdWxkVXNlRmxhdHBhayk6IFJldHVybiBlYXJseSBpZiBXRUJLSVRfSkhCVUlM RCBpcyBzZXQuCisKIDIwMjAtMDMtMTggIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI1ODYyNik6IHdlYmtpdC1kaXJzIHdhcm5p bmcKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQppbmRleCBhNjU3N2ZjZDYyZS4uMmI1MTBhYTM4NjggMTAwNzU1Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dGRpcnMucG0KQEAgLTIxNzMsNiArMjE3MywxMCBAQCBzdWIgc2hvdWxkVXNlRmxhdHBhaygpCiAg ICAgICAgIHJldHVybiAwOwogICAgIH0KIAorICAgIGlmIChkZWZpbmVkICRFTlZ7J1dFQktJVF9K SEJVSUxEJ30gJiYgJEVOVnsnV0VCS0lUX0pIQlVJTEQnfSkgeworICAgICAgICByZXR1cm4gMDsK KyAgICB9CisKICAgICBteSBAcHJlZml4ID0gd3JhcHBlclByZWZpeElmTmVlZGVkKCk7CiAgICAg cmV0dXJuICgoISBpbkZsYXRwYWtTYW5kYm94KCkpIGFuZCAoQHByZWZpeCA9PSAwKSBhbmQgLWUg Z2V0VXNlckZsYXRwYWtQYXRoKCkpOwogfQo=