136209 2014-08-25 00:24:51 -0700 [GTK] Unify webkitgtk and webkit2gtk directories 2014-08-25 06:05:53 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 berto webkit-unassigned bunhere cgarcia commit-queue gyuyoung.kim rakuco sergio oldest_to_newest 1031054 0 berto 2014-08-25 00:24:51 -0700 We are using ${libexec}/webkitgtk-4.0/ to install the web, plugin and network process binaries, however we are using webkit2gtk everywhere else (including in the injected bundle installation path). I don't know if there's a good reason to keep them separate, so I propose that we use the same name for both. See also bug 135754. 1031056 1 237064 berto 2014-08-25 00:30:45 -0700 Created attachment 237064 Patch 1031114 2 cgarcia 2014-08-25 05:30:52 -0700 (In reply to comment #0) > We are using ${libexec}/webkitgtk-4.0/ to install the web, plugin and > network process binaries, however we are using webkit2gtk everywhere > else (including in the injected bundle installation path). Well, not everything else, we use webkitgtk-4.0 for the header files, because webkitgtk is the name of the package, and it contains subdirectories for the header files of the different public APIs. > I don't know if there's a good reason to keep them separate, so I > propose that we use the same name for both. > > See also bug 135754. 1031115 3 237064 cgarcia 2014-08-25 05:31:38 -0700 Comment on attachment 237064 Patch Ok. 1031128 4 237064 commit-queue 2014-08-25 06:05:49 -0700 Comment on attachment 237064 Patch Clearing flags on attachment: 237064 Committed r172921: <http://trac.webkit.org/changeset/172921> 1031129 5 commit-queue 2014-08-25 06:05:53 -0700 All reviewed patches have been landed. Closing bug. 237064 2014-08-25 00:30:45 -0700 2014-08-25 06:05:48 -0700 Patch 136209.diff text/plain 1658 berto ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBjODVkNjI2Li4yZTdjMTc5 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTQtMDgtMjUgIEFsYmVydG8gR2FyY2lhICA8YmVydG9AaWdhbGlhLmNvbT4KKworICAgICAg ICBbR1RLXSBVbmlmeSB3ZWJraXRndGsgYW5kIHdlYmtpdDJndGsgZGlyZWN0b3JpZXMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjIwOQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSB3ZWJraXQyZ3Rr LVguWCBib3RoIGZvciB0aGUgcHJvY2VzcyBiaW5hcmllcyBhbmQgdGhlIGluamVjdGVkCisgICAg ICAgIGJ1bmRsZS4KKworICAgICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlOgor CiAyMDE0LTA4LTI0ICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KIAogICAg ICAgICBbRUZMXSBNb3ZlIEVmbCBzcGVjaWZpYyBjb2RlIGZyb20gU291cmNlL0NNYWtlTGlzdHMu dHh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9j bWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IGFhNzM4MWEuLjM3N2I4MTkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25z R1RLLmNtYWtlCkBAIC0yMCw3ICsyMCw3IEBAIHNldChFTkFCTEVfV0FZTEFORF9UQVJHRVQgT0ZG IENBQ0hFIEJPT0wgIldoZXRoZXIgdG8gZW5hYmxlIHN1cHBvcnQgZm9yIHRoZSBXYXlsCiAjIENN QUtFX0lOU1RBTExfKiB2YXJpYWJsZXMgdGhhdCBhcmUgcG9wdWxhdGVkIGJ5IHRoZSBHTlVJbnN0 YWxsRGlycyBtYWNyby4KIHNldChMSUJfSU5TVEFMTF9ESVIgIiR7Q01BS0VfSU5TVEFMTF9GVUxM X0xJQkRJUn0iIENBQ0hFIFBBVEggIkFic29sdXRlIHBhdGggdG8gbGlicmFyeSBpbnN0YWxsYXRp b24gZGlyZWN0b3J5IikKIHNldChFWEVDX0lOU1RBTExfRElSICIke0NNQUtFX0lOU1RBTExfRlVM TF9CSU5ESVJ9IiBDQUNIRSBQQVRIICJBYnNvbHV0ZSBwYXRoIHRvIGV4ZWN1dGFibGUgaW5zdGFs bGF0aW9uIGRpcmVjdG9yeSIpCi1zZXQoTElCRVhFQ19JTlNUQUxMX0RJUiAiJHtDTUFLRV9JTlNU QUxMX0ZVTExfTElCRVhFQ0RJUn0vd2Via2l0Z3RrLSR7V0VCS0lUR1RLX0FQSV9WRVJTSU9OfSIg Q0FDSEUgUEFUSCAiQWJzb2x1dGUgcGF0aCB0byBpbnN0YWxsIGV4ZWN1dGFibGVzIGV4ZWN1dGVk IGJ5IHRoZSBsaWJyYXJ5IikKK3NldChMSUJFWEVDX0lOU1RBTExfRElSICIke0NNQUtFX0lOU1RB TExfRlVMTF9MSUJFWEVDRElSfS93ZWJraXQyZ3RrLSR7V0VCS0lUR1RLX0FQSV9WRVJTSU9OfSIg Q0FDSEUgUEFUSCAiQWJzb2x1dGUgcGF0aCB0byBpbnN0YWxsIGV4ZWN1dGFibGVzIGV4ZWN1dGVk IGJ5IHRoZSBsaWJyYXJ5IikKIAogc2V0KERBVEFfQlVJTERfRElSICIke0NNQUtFX0JJTkFSWV9E SVJ9L3NoYXJlLyR7V2ViS2l0X09VVFBVVF9OQU1FfSIpCiBzZXQoREFUQV9JTlNUQUxMX0RJUiAi JHtDTUFLRV9JTlNUQUxMX0RBVEFESVJ9L3dlYmtpdGd0ay0ke1dFQktJVEdUS19BUElfVkVSU0lP Tn0iKQo=