140070 2015-01-04 20:10:03 -0800 [GTK] Rename LIBEXECDIR to PKGLIBEXECDIR 2015-07-15 13:35:34 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 140068 110014 1 mcatanzaro mcatanzaro cgarcia commit-queue mcatanzaro mrobinson zan oldest_to_newest 1058644 0 mcatanzaro 2015-01-04 20:10:03 -0800 The path that's currently stored in LIBEXECDIR is one level lower than the real LIBEXECDIR, which we are going to need. Introduce PKGLIBEXECDIR so that we can use LIBEXECDIR for the real LIBEXECDIR in the future. 1058645 1 243958 mcatanzaro 2015-01-04 20:18:54 -0800 Created attachment 243958 Patch 1058670 2 243958 cgarcia 2015-01-04 23:21:55 -0800 Comment on attachment 243958 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243958&action=review > Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp:62 > - return pathByAppendingComponent(filenameToString(LIBEXECDIR), processName); > + return pathByAppendingComponent(filenameToString(PKGLIBEXECDIR), processName); If it's one level lower, how can this work? I'm confused. 1058725 3 mcatanzaro 2015-01-05 10:09:15 -0800 (In reply to comment #2) > If it's one level lower, how can this work? I'm confused. It works because the patch only renames that compile-time constant. Now, as for why we should do it: $LIBEXEC_INSTALL_DIR is set in OptionsGTK.cmake to $(libexecdir)/webkitgtk-4.0 (that's how we'd write it using Autotools). This is confusing, but it's the result of different naming conventions. The platform-independent WebKit2/CMakeLists.txt, which I did not want to change, installs our helper binaries to $LIBEXEC_INSTALL_DIR, which makes sense if you consider that $LIBEXEC_INSTALL_DIR should be a subdirectory of GNU $(libexecdir) -- we don't install anything directly in $(libexecdir), so this is a reasonable definition for $LIBEXEC_INSTALL_DIR, which doesn't need to be changed. But $LIBEXEC_INSTALL_DIR is not $(libexecdir), which is how we treat it in our GTK+ specific code, by setting $LIBEXECDIR = $LIBEXEC_INSTALL_DIR. This works because our code currently uses $LIBEXECDIR only for launching our helper binaries in $(libexecdir)/webkitgtk-4.0, but I need to use it to refer to the actual $(libexecdir) and I don't want to type LIBEXEDIR + "../" in order to get to $(libexecdir), which would be very confusing. Now, note that in Autotools, $(libexecdir)/webkitgtk-4.0 would be equivalent to $(pkglibexecdir), so the least-confusing way around this problem is to just set $LIBEXECDIR to what would in Autotools be $(libexecdir) and $PKGLIBEXECDIR to what would in Autotools be $(pkglibexecdir) and what in our build system is $LIBEXEC_INSTALL_DIR. 1109631 4 243958 mcatanzaro 2015-07-15 08:09:31 -0700 Comment on attachment 243958 Patch (More easy patches!) 1109638 5 mrobinson 2015-07-15 09:13:34 -0700 (In reply to comment #4) > Comment on attachment 243958 [details] > Patch > > (More easy patches!) Perhaps PACKAGE_LIBEXECDIR or LIBEXEC_INSTALL_DIR for consistency? 1109654 6 mcatanzaro 2015-07-15 11:02:01 -0700 I'd rather rename PACKAGE_LOCALE_DIR to LOCALEDIR, for consistency with the familiar GNU directory names; what do you think? To me, the PACKAGE_ prefix is reminiscent of the PKGWHATEVER prefix used in Autotools, which means "a directory named for the project underneath the WHATEVER directory," but that's not what PACKAGE_LOCALE_DIR is. 1109661 7 mcatanzaro 2015-07-15 12:04:50 -0700 Martin agreed on IRC to use PKGLIBEXECDIR. (And presumably he wants LOCALEDIR too, for consistency? I will do that in a separate patch after this one lands.) 1109682 8 243958 commit-queue 2015-07-15 13:35:30 -0700 Comment on attachment 243958 Patch Clearing flags on attachment: 243958 Committed r186852: <http://trac.webkit.org/changeset/186852> 1109683 9 commit-queue 2015-07-15 13:35:34 -0700 All reviewed patches have been landed. Closing bug. 243958 2015-01-04 20:18:54 -0800 2015-07-15 13:35:30 -0700 Patch 0007-GTK-Rename-LIBEXECDIR-to-PKGLIBEXECDIR.patch text/plain 2884 mcatanzaro RnJvbSAxZDhiYmZhZWUyNzFjNmIwNjAwNWZlMWVhYmQyZmVjMzdkNDk1MWUzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWNoYWVsIENhdGFuemFybyA8bWNhdGFuemFyb0BpZ2FsaWEu Y29tPgpEYXRlOiBUdWUsIDMwIERlYyAyMDE0IDE5OjExOjQ4IC0wNjAwClN1YmplY3Q6IFtQQVRD SCA3LzddIFtHVEtdIFJlbmFtZSBMSUJFWEVDRElSIHRvIFBLR0xJQkVYRUNESVIKClRoZSBwYXRo IHRoYXQncyBjdXJyZW50bHkgc3RvcmVkIGluIExJQkVYRUNESVIgaXMgb25lIGxldmVsIGxvd2Vy IHRoYW4KdGhlIHJlYWwgTElCRVhFQ0RJUiwgd2hpY2ggd2UgYXJlIGdvaW5nIHRvIG5lZWQuIElu dHJvZHVjZSBQS0dMSUJFWEVDRElSCnNvIHRoYXQgd2UgY2FuIHVzZSBMSUJFWEVDRElSIGZvciB0 aGUgcmVhbCBMSUJFWEVDRElSIGluIHRoZSBmdXR1cmUuCi0tLQogU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMTUgKysrKysrKysrKysrKysr CiBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUdUSy5jbWFrZSAgICAgICAgICAgICAgICAgICAgICAg fCAgMiArLQogU291cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9Qcm9jZXNzRXhlY3V0YWJsZVBhdGhH dGsuY3BwIHwgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMiBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOWFjNjVkOC4uN2Y1N2ExMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAt MSw1ICsxLDIwIEBACiAyMDE1LTAxLTA0ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9A aWdhbGlhLmNvbT4KIAorICAgICAgICBbR1RLXSBSZW5hbWUgTElCRVhFQ0RJUiB0byBQS0dMSUJF WEVDRElSCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDAwNzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGUgcGF0aCB0aGF0J3MgY3VycmVudGx5IHN0b3JlZCBpbiBMSUJFWEVDRElSIGlzIG9uZSBsZXZl bCBsb3dlciB0aGFuCisgICAgICAgIHRoZSByZWFsIExJQkVYRUNESVIsIHdoaWNoIHdlIGFyZSBn b2luZyB0byBuZWVkLiBJbnRyb2R1Y2UgUEtHTElCRVhFQ0RJUgorICAgICAgICBzbyB0aGF0IHdl IGNhbiB1c2UgTElCRVhFQ0RJUiBmb3IgdGhlIHJlYWwgTElCRVhFQ0RJUiBpbiB0aGUgZnV0dXJl LgorCisgICAgICAgICogUGxhdGZvcm1HVEsuY21ha2U6CisgICAgICAgICogU2hhcmVkL2d0ay9Q cm9jZXNzRXhlY3V0YWJsZVBhdGhHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpmaW5kV2ViS2l0 UHJvY2Vzcyk6CisKKzIwMTUtMDEtMDQgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0Bp Z2FsaWEuY29tPgorCiAgICAgICAgIFtMaW51eF0gU2VjY29tcEJyb2tlckNsaWVudCBzaG91bGQg Y2FjaGUgYXJiaXRyYXJ5IGZpbGUgZGVzY3JpcHRvcnMKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDA2OAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9QbGF0Zm9ybUdUSy5jbWFrZSBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtR1RLLmNtYWtl CmluZGV4IDUyYmRjNTUuLmIwMDJkN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRm b3JtR1RLLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtR1RLLmNtYWtlCkBAIC04 LDcgKzgsNyBAQCBjb25maWd1cmVfZmlsZSh3ZWJraXQyZ3RrLnBjLmluICR7V2ViS2l0Ml9QS0dD T05GSUdfRklMRX0gQE9OTFkpCiBjb25maWd1cmVfZmlsZSh3ZWJraXQyZ3RrLXdlYi1leHRlbnNp b24ucGMuaW4gJHtXZWJLaXQyV2ViRXh0ZW5zaW9uX1BLR0NPTkZJR19GSUxFfSBAT05MWSkKIAog YWRkX2RlZmluaXRpb25zKC1EV0VCS0lUMl9DT01QSUxBVElPTikKLWFkZF9kZWZpbml0aW9ucygt RExJQkVYRUNESVI9IiR7TElCRVhFQ19JTlNUQUxMX0RJUn0iKQorYWRkX2RlZmluaXRpb25zKC1E UEtHTElCRVhFQ0RJUj0iJHtMSUJFWEVDX0lOU1RBTExfRElSfSIpCiBhZGRfZGVmaW5pdGlvbnMo LURQQUNLQUdFX0xPQ0FMRV9ESVI9IiR7Q01BS0VfSU5TVEFMTF9GVUxMX0xPQ0FMRURJUn0iKQog YWRkX2RlZmluaXRpb25zKC1ETElCRElSPSIke0xJQl9JTlNUQUxMX0RJUn0iKQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ3RrL1Byb2Nlc3NFeGVjdXRhYmxlUGF0aEd0ay5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ3RrL1Byb2Nlc3NFeGVjdXRhYmxlUGF0aEd0ay5j cHAKaW5kZXggZTc1N2NjMi4uYmY5OWZlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hh cmVkL2d0ay9Qcm9jZXNzRXhlY3V0YWJsZVBhdGhHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNwcApAQCAtNTksNyArNTksNyBA QCBzdGF0aWMgU3RyaW5nIGZpbmRXZWJLaXRQcm9jZXNzKGNvbnN0IGNoYXIqIHByb2Nlc3NOYW1l KQogICAgICAgICAgICAgcmV0dXJuIHByb2Nlc3NQYXRoOwogICAgIH0KIAotICAgIHJldHVybiBw YXRoQnlBcHBlbmRpbmdDb21wb25lbnQoZmlsZW5hbWVUb1N0cmluZyhMSUJFWEVDRElSKSwgcHJv Y2Vzc05hbWUpOworICAgIHJldHVybiBwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoZmlsZW5hbWVU b1N0cmluZyhQS0dMSUJFWEVDRElSKSwgcHJvY2Vzc05hbWUpOwogfQogCiBTdHJpbmcgZXhlY3V0 YWJsZVBhdGhPZldlYlByb2Nlc3MoKQotLSAKMi4xLjAKCg==