151096 2015-11-10 08:13:51 -0800 [UNIX] Environment variable should take precedence over directories in plugin search path 2015-11-10 08:50:33 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned gustavo mrobinson zan oldest_to_newest 1140771 0 cgarcia 2015-11-10 08:13:51 -0800 Otherwise you can't override the directories using the env vars for plugins already installed. 1140772 1 265180 cgarcia 2015-11-10 08:15:49 -0800 Created attachment 265180 Patch 1140779 2 cgarcia 2015-11-10 08:50:33 -0800 Committed r192248: <http://trac.webkit.org/changeset/192248> 265180 2015-11-10 08:15:49 -0800 2015-11-10 08:27:29 -0800 Patch wk2-plugins-env-vars.diff text/plain 2370 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlZWZjZjlmLi5mZjdjMzY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTgg QEAKIDIwMTUtMTEtMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtVTklYXSBFbnZpcm9ubWVudCB2YXJpYWJsZSBzaG91bGQgdGFrZSBwcmVj ZWRlbmNlIG92ZXIgZGlyZWN0b3JpZXMgaW4gcGx1Z2luIHNlYXJjaCBwYXRoCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTEwOTYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPdGhlcndpc2UgeW91IGNhbid0 IG92ZXJyaWRlIHRoZSBkaXJlY3RvcmllcyB1c2luZyB0aGUgZW52IHZhcnMKKyAgICAgICAgZm9y IHBsdWdpbnMgYWxyZWFkeSBpbnN0YWxsZWQuCisKKyAgICAgICAgKiBTaGFyZWQvUGx1Z2lucy91 bml4L1BsdWdpblNlYXJjaFBhdGguY3BwOgorICAgICAgICAoV2ViS2l0OjpwbHVnaW5zRGlyZWN0 b3JpZXMpOgorCisyMDE1LTExLTEwICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdh bGlhLmNvbT4KKwogICAgICAgICBbR1RLXSBVc2UgQ1JPU1NfUExBVEZPUk1fQ09OVEVYVF9NRU5V UwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwNjQy CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL3VuaXgvUGx1Z2lu U2VhcmNoUGF0aC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy91bml4L1BsdWdp blNlYXJjaFBhdGguY3BwCmluZGV4IDJkYzk0OTguLjdlODkyZjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL3VuaXgvUGx1Z2luU2VhcmNoUGF0aC5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvdW5peC9QbHVnaW5TZWFyY2hQYXRoLmNwcApA QCAtMzcsNiArMzcsMTcgQEAgVmVjdG9yPFN0cmluZz4gcGx1Z2luc0RpcmVjdG9yaWVzKCkKICAg ICBWZWN0b3I8U3RyaW5nPiByZXN1bHQ7CiAKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQ SSkKKyAgICBTdHJpbmcgbW96aWxsYVBhdGhzKGdldGVudigiTU9aX1BMVUdJTl9QQVRIIikpOwor ICAgIGlmICghbW96aWxsYVBhdGhzLmlzRW1wdHkoKSkgeworICAgICAgICBWZWN0b3I8U3RyaW5n PiBwYXRoczsKKyAgICAgICAgbW96aWxsYVBhdGhzLnNwbGl0KFVDaGFyKCc6JyksIC8qIGFsbG93 RW1wdHlFbnRyaWVzICovIGZhbHNlLCBwYXRocyk7CisgICAgICAgIHJlc3VsdC5hcHBlbmRWZWN0 b3IocGF0aHMpOworICAgIH0KKworICAgIFN0cmluZyBtb3ppbGxhSG9tZShnZXRlbnYoIk1PWklM TEFfSE9NRSIpKTsKKyAgICBpZiAoIW1vemlsbGFIb21lLmlzRW1wdHkoKSkKKyAgICAgICAgcmVz dWx0LmFwcGVuZChtb3ppbGxhSG9tZSArICIvcGx1Z2lucyIpOworCiAgICAgcmVzdWx0LmFwcGVu ZChob21lRGlyZWN0b3J5UGF0aCgpICsgIi8ubW96aWxsYS9wbHVnaW5zIik7CiAgICAgcmVzdWx0 LmFwcGVuZChob21lRGlyZWN0b3J5UGF0aCgpICsgIi8ubmV0c2NhcGUvcGx1Z2lucyIpOwogICAg IHJlc3VsdC5hcHBlbmQoIi91c3IvbGliL2Jyb3dzZXIvcGx1Z2lucyIpOwpAQCAtNTcsMTcgKzY4 LDYgQEAgVmVjdG9yPFN0cmluZz4gcGx1Z2luc0RpcmVjdG9yaWVzKCkKICAgICByZXN1bHQuYXBw ZW5kKCIvdXNyL2xpYjY0L21vemlsbGEvcGx1Z2lucyIpOwogICAgIHJlc3VsdC5hcHBlbmQoIi91 c3IvbGliL25zYnJvd3Nlci9wbHVnaW5zIik7CiAgICAgcmVzdWx0LmFwcGVuZCgiL3Vzci9saWI2 NC9uc2Jyb3dzZXIvcGx1Z2lucyIpOwotCi0gICAgU3RyaW5nIG1vemlsbGFIb21lKGdldGVudigi TU9aSUxMQV9IT01FIikpOwotICAgIGlmICghbW96aWxsYUhvbWUuaXNFbXB0eSgpKQotICAgICAg ICByZXN1bHQuYXBwZW5kKG1vemlsbGFIb21lICsgIi9wbHVnaW5zIik7Ci0KLSAgICBTdHJpbmcg bW96aWxsYVBhdGhzKGdldGVudigiTU9aX1BMVUdJTl9QQVRIIikpOwotICAgIGlmICghbW96aWxs YVBhdGhzLmlzRW1wdHkoKSkgewotICAgICAgICBWZWN0b3I8U3RyaW5nPiBwYXRoczsKLSAgICAg ICAgbW96aWxsYVBhdGhzLnNwbGl0KFVDaGFyKCc6JyksIC8qIGFsbG93RW1wdHlFbnRyaWVzICov IGZhbHNlLCBwYXRocyk7Ci0gICAgICAgIHJlc3VsdC5hcHBlbmRWZWN0b3IocGF0aHMpOwotICAg IH0KICNlbmRpZgogCiAgICAgcmV0dXJuIHJlc3VsdDsK