222102 2021-02-18 05:48:13 -0800 [Flatpak SDK] Cog build fails when gst-build is enabled 2021-02-22 02:22:14 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand webkit-bug-importer zan zdobersek oldest_to_newest 1730825 0 pnormand 2021-02-18 05:48:13 -0800 Because gst-build overrides the PKG_CONFIG_PATH in the sandbox, instead of aggregating to the one previously set, Cog fails to find the wpewebkit.pc file. 1730890 1 420836 pnormand 2021-02-18 09:18:24 -0800 Created attachment 420836 Patch 1732068 2 ews-feeder 2021-02-22 02:21:58 -0800 Committed r273234: <https://commits.webkit.org/r273234> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420836. 1732069 3 webkit-bug-importer 2021-02-22 02:22:14 -0800 <rdar://problem/74589231> 420836 2021-02-18 09:18:24 -0800 2021-02-22 02:21:59 -0800 Patch bug-222102-20210218091823.patch text/plain 4812 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMDczCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWViOWYxOWI4ZjQyZWFmMmMxMzZmYzliY2RhOTdhZjll ZmMyNmQ2My4uY2MyODg3NmE4MjQzOWJhY2FiNTk4ZjI0NTgwYWE4OTljYTMwYjliYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIxLTAyLTE4ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIENvZyBidWlsZCBmYWlscyB3aGVuIGdzdC1idWlsZCBp cyBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjIxMDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNZXJnZSBnc3QtYnVpbGQgZW52IHZhcnMgaW4gdGhlIHNhbmRib3ggZW52aXJvbm1lbnQsIHdp dGhvdXQgb3ZlcnJpZGluZyBwcmV2aW91c2x5IHNldCBQQVRICisgICAgICAgIHZhbHVlcyBzdWNo IGFzIFBLR19DT05GSUdfUEFUSC4KKworICAgICAgICAqIGZsYXRwYWsvZmxhdHBha3V0aWxzLnB5 OgorICAgICAgICAoV2Via2l0RmxhdHBhay5zZXR1cF9nc3RidWlsZCk6CisgICAgICAgIChXZWJr aXRGbGF0cGFrLnJ1bl9pbl9zYW5kYm94KToKKwogMjAyMS0wMi0xOCAgQW50b2luZSBRdWludCAg PGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBQYWdlIHVwZGF0ZXMgYW5kIHJBRiBjYWxs YmFja3Mgc2hvdWxkIHJ1biBhdCBhIGZyZXF1ZW5jeSBjbG9zZSB0byA2MEh6IG9uIGhpZ2ggcmVm cmVzaC1yYXRlIGRpc3BsYXlzCmRpZmYgLS1naXQgYS9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGls cy5weSBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CmluZGV4IGNiYWRlYjc4NzA0MGU0 MWMwZWUwYzVlYTBmZmI1ZGE0MDJjNDRmNzMuLjA4MTBhZmRiNmIyNzY5NTU0NGZmYmNlN2YyMzE1 NTU2YTA5NzMxZTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5Cisr KyBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CkBAIC02MDIsNyArNjAyLDcgQEAgY2xh c3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgaWYgbm90IGdzdF9kaXI6CiAgICAgICAgICAgICBp ZiBidWlsZGluZzoKICAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCIkR1NUX0JVSUxEX1BBVEgg ZW52aXJvbm1lbnQgdmFyaWFibGUgbm90IHNldC4gU2tpcHBpbmcgZ3N0LWJ1aWxkXG4iKQotICAg ICAgICAgICAgcmV0dXJuIFtdCisgICAgICAgICAgICByZXR1cm4ge30KIAogICAgICAgICBpZiBu b3Qgb3MucGF0aC5leGlzdHMob3MucGF0aC5qb2luKGdzdF9kaXIsICdnc3QtZW52LnB5JykpOgog ICAgICAgICAgICAgcmFpc2UgUnVudGltZUVycm9yKCdHU1RfQlVJTERfUEFUSCBzZXQgdG8gJXMg YnV0IGl0IGRvZXNuXCd0IHNlZW0gdG8gYmUgYSB2YWxpZCBgZ3N0LWJ1aWxkYCBjaGVja291dC4n ICUgZ3N0X2RpcikKQEAgLTYyNyw3ICs2MjcsNyBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAg ICAgICBnc3RfZW52ID0gcnVuX3Nhbml0aXplZChjb21tYW5kLCBnYXRoZXJfb3V0cHV0PVRydWUp CiAgICAgICAgIGFsbG93bGlzdCA9ICgiTERfTElCUkFSWV9QQVRIIiwgIlBBVEgiLCAiUEtHX0NP TkZJR19QQVRIIikKICAgICAgICAgbm9wYXRobGlzdCA9ICgiR1NUX0RFQlVHIiwgIkdTVF9WRVJT SU9OIiwgIkdTVF9FTlYiKQotICAgICAgICBlbnYgPSBbXQorICAgICAgICBlbnYgPSB7fQogICAg ICAgICBmb3IgbGluZSBpbiBbbGluZSBmb3IgbGluZSBpbiBnc3RfZW52LnNwbGl0bGluZXMoKSBp ZiBub3QgbGluZS5zdGFydHN3aXRoKCJleHBvcnQiKV06CiAgICAgICAgICAgICB0b2tlbnMgPSBs aW5lLnNwbGl0KCI9IikKICAgICAgICAgICAgIHZhcl9uYW1lLCBjb250ZW50cyA9IHRva2Vuc1sw XSwgIj0iLmpvaW4odG9rZW5zWzE6XSkKQEAgLTYzNyw3ICs2MzcsNyBAQCBjbGFzcyBXZWJraXRG bGF0cGFrOgogICAgICAgICAgICAgICAgIG5ld19jb250ZW50cyA9ICc6Jy5qb2luKFtzZWxmLmhv c3RfcGF0aF90b19zYW5kYm94X3BhdGgocCkgZm9yIHAgaW4gY29udGVudHMuc3BsaXQoIjoiKV0p CiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgIG5ld19jb250ZW50cyA9IGNvbnRl bnRzLnJlcGxhY2UoIiciLCAiIikKLSAgICAgICAgICAgIGVudi5hcHBlbmQoIi0tZW52PSVzPSVz IiAlICh2YXJfbmFtZSwgbmV3X2NvbnRlbnRzKSkKKyAgICAgICAgICAgIGVudlt2YXJfbmFtZV0g PSBuZXdfY29udGVudHMKICAgICAgICAgcmV0dXJuIGVudgogCiAgICAgZGVmIGlzX2JyYW5jaF9i dWlsZChzZWxmKToKQEAgLTg0OSwxMSArODQ5LDI3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAg ICAgICAgICAgICAgICAgIk5VTUJFUl9PRl9QUk9DRVNTT1JTIjogbl9jb3JlcywKICAgICAgICAg ICAgIH0pCiAKLSAgICAgICAgZm9yIGVudnZhciwgdmFsdWUgaW4gc2FuZGJveF9lbnZpcm9ubWVu dC5pdGVtcygpOgotICAgICAgICAgICAgZmxhdHBha19jb21tYW5kLmFwcGVuZCgiLS1lbnY9JXM9 JXMiICUgKGVudnZhciwgdmFsdWUpKQorICAgICAgICAjIFNldCBQS0dfQ09ORklHX1BBVEggaW4g c2FuZGJveCBzbyB1bmluc3RhbGxlZCBXZWJLaXQucGMgZmlsZXMgY2FuIGJlIHVzZWQuCisgICAg ICAgIHBrZ19jb25maWdfcGF0aCA9IG9zLmVudmlyb24uZ2V0KCJQS0dfQ09ORklHX1BBVEgiKQor ICAgICAgICBpZiBwa2dfY29uZmlnX3BhdGg6CisgICAgICAgICAgICBwa2dfY29uZmlnX3BhdGgg PSAiJXM6JXMiICUgKHNlbGYuYnVpbGRfcGF0aCwgcGtnX2NvbmZpZ19wYXRoKQorICAgICAgICBl bHNlOgorICAgICAgICAgICAgcGtnX2NvbmZpZ19wYXRoID0gc2VsZi5idWlsZF9wYXRoCisgICAg ICAgIHNhbmRib3hfZW52aXJvbm1lbnRbIlBLR19DT05GSUdfUEFUSCJdID0gcGtnX2NvbmZpZ19w YXRoCiAKICAgICAgICAgaWYgbm90IGJ1aWxkaW5nX2dzdCBhbmQgYXJnc1swXSAhPSAic2NjYWNo ZSI6Ci0gICAgICAgICAgICBleHRyYV9mbGF0cGFrX2FyZ3MuZXh0ZW5kKHNlbGYuc2V0dXBfZ3N0 YnVpbGQoYnVpbGRpbmcpKQorICAgICAgICAgICAgIyBNZXJnZSBnc3QtYnVpbGQgZW52IHZhcnMg aW4gc2FuZGJveCBlbnZpcm9ubWVudCwgd2l0aG91dCBvdmVycmlkaW5nIHByZXZpb3VzbHkgc2V0 IFBBVEggdmFsdWVzLgorICAgICAgICAgICAgZ3N0X2VudiA9IHNlbGYuc2V0dXBfZ3N0YnVpbGQo YnVpbGRpbmcpCisgICAgICAgICAgICBmb3IgdmFyX25hbWUgaW4gbGlzdChnc3RfZW52LmtleXMo KSk6CisgICAgICAgICAgICAgICAgaWYgdmFyX25hbWUgbm90IGluIHNhbmRib3hfZW52aXJvbm1l bnQ6CisgICAgICAgICAgICAgICAgICAgIHNhbmRib3hfZW52aXJvbm1lbnRbdmFyX25hbWVdID0g Z3N0X2Vudlt2YXJfbmFtZV0KKyAgICAgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAg ICAgICBjb250ZW50cyA9IGdzdF9lbnZbdmFyX25hbWVdCisgICAgICAgICAgICAgICAgICAgIGlm IHZhcl9uYW1lLmVuZHN3aXRoKCdQQVRIJyk6CisgICAgICAgICAgICAgICAgICAgICAgICBzYW5k Ym94X2Vudmlyb25tZW50W3Zhcl9uYW1lXSA9ICIlczolcyIgJSAoc2FuZGJveF9lbnZpcm9ubWVu dFt2YXJfbmFtZV0sIGNvbnRlbnRzKQorCisgICAgICAgIGZvciBlbnZ2YXIsIHZhbHVlIGluIHNh bmRib3hfZW52aXJvbm1lbnQuaXRlbXMoKToKKyAgICAgICAgICAgIGZsYXRwYWtfY29tbWFuZC5h cHBlbmQoIi0tZW52PSVzPSVzIiAlIChlbnZ2YXIsIHZhbHVlKSkKIAogICAgICAgICBmbGF0cGFr X2VudiA9IG9zLmVudmlyb24uY29weSgpCiAgICAgICAgIGZvciBlbnZ2YXIgaW4gbGlzdChmbGF0 cGFrX2Vudi5rZXlzKCkpOgpAQCAtODY4LDIwICs4ODQsMTIgQEAgY2xhc3MgV2Via2l0RmxhdHBh azoKIAogICAgICAgICBmbGF0cGFrX2NvbW1hbmQgKz0gZXh0cmFfZmxhdHBha19hcmdzICsgWyct LWNvbW1hbmQ9JXMnICUgYXJnc1swXSwgIm9yZy53ZWJraXQuU2RrIl0gKyBhcmdzWzE6XQogCi0K ICAgICAgICAgZmxhdHBha19lbnYudXBkYXRlKHsKICAgICAgICAgICAgICJGTEFUUEFLX0JXUkFQ Ijogb3MucGF0aC5qb2luKHNjcmlwdGRpciwgIndlYmtpdC1id3JhcCIpLAogICAgICAgICAgICAg IldFQktJVF9CVUlMRF9ESVJfQklORF9NT1VOVCI6ICIlczolcyIgJSAoc2FuZGJveF9idWlsZF9w YXRoLCBzZWxmLmJ1aWxkX3BhdGgpLAogICAgICAgICAgICAgIldFQktJVF9GTEFUUEFLX1VTRVJf RElSIjogb3MuZW52aXJvblsiRkxBVFBBS19VU0VSX0RJUiJdLAogICAgICAgICB9KQogCi0gICAg ICAgIHBrZ19jb25maWdfcGF0aCA9IGZsYXRwYWtfZW52LmdldCgiUEtHX0NPTkZJR19QQVRIIikK LSAgICAgICAgaWYgcGtnX2NvbmZpZ19wYXRoOgotICAgICAgICAgICAgcGtnX2NvbmZpZ19wYXRo ID0gIiVzOiVzIiAlIChzZWxmLmJ1aWxkX3BhdGgsIHBrZ19jb25maWdfcGF0aCkKLSAgICAgICAg ZWxzZToKLSAgICAgICAgICAgIHBrZ19jb25maWdfcGF0aCA9IHNlbGYuYnVpbGRfcGF0aAotICAg ICAgICBmbGF0cGFrX2VudlsiUEtHX0NPTkZJR19QQVRIIl0gPSBwa2dfY29uZmlnX3BhdGgKLQog ICAgICAgICB0cnk6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5leGVjdXRlX2NvbW1hbmQoZmxh dHBha19jb21tYW5kLCBzdGRvdXQ9c3Rkb3V0LCBlbnY9ZmxhdHBha19lbnYpCiAgICAgICAgIGV4 Y2VwdCBLZXlib2FyZEludGVycnVwdDoK