184376 2018-04-06 17:48:37 -0700 [WPE] Improve include hierarchy 2018-04-12 08:51:17 -0700 1 1 1 Unclassified WebKit WPE WebKit WebKit Nightly Build Mac Linux RESOLVED FIXED P2 Normal --- 178894 1 mcatanzaro mcatanzaro bugs-noreply commit-queue mcatanzaro zan oldest_to_newest 1412527 0 mcatanzaro 2018-04-06 17:48:37 -0700 Currently we have: /usr/include/wpe-0.1/WPE/JavaScriptCore (see bug #184375) /usr/include/wpe-0.1/WPE/jsc /usr/include/wpe-0.1/WPE/wpe And in the pkg-config: Cflags: -I${includedir}/wpe-0.1 -I${includedir}/wpe-0.1/WPE In contrast to WebKitGTK+: /usr/include/webkit2gtk-4.0/JavaScriptCore /usr/include/webkit2gtk-4.0/jsc (hopefully, haven't checked trunk :) /usr/include/webkit2gtk-4.0/webkit2 /usr/include/webkit2gtk-4.0/webkitdom Cflags: -I${includedir}/webkitgtk-4.0 It's desirable to eliminate the unnecessary WPE subdirectory. In theory, this could cause problems if WebKitGTK+ and WPE ever get pulled into the same include path, since the jsc headers could conflict, but such a case is guaranteed to explode at runtime due to symbol collisions, so this shouldn't ever be a problem in practice. 1412545 1 mcatanzaro 2018-04-06 19:22:10 -0700 (In reply to Michael Catanzaro from comment #0) > In theory, > this could cause problems if WebKitGTK+ and WPE ever get pulled into the > same include path, since the jsc headers could conflict Sorry, I wasn't thinking properly. There's no difference because wpe-0.1/WPE was already previously in the Cflags. 1412547 2 337411 mcatanzaro 2018-04-06 19:26:33 -0700 Created attachment 337411 Patch 1412549 3 mcatanzaro 2018-04-06 19:28:44 -0700 This will break any applications including headers as: #include <WPE/wpe/webkit.h> rather than: #include <wpe/webkit.h> Now only the later style is permitted. 1412652 4 mcatanzaro 2018-04-07 18:29:38 -0700 This kinda-sorta conflicts with https://github.com/WebPlatformForEmbedded/WPEBackend/issues/10. It should be "fine" as in no build failures, but it's going to result in the headers being installed into the same place. We should still do this, but I further suggest switching WebKit from using /usr/include/wpe-0.1 to /usr/include/wpe-webkit-0.1 to further disambiguate. Alternative schemes are possible, of course. 1412866 5 mcatanzaro 2018-04-09 07:13:16 -0700 Let's change the include path to use wpe-webkit-0.1 instead of wpe-0.1, so we can have separate API versions for WebKit and libwpe. 1413118 6 337568 mcatanzaro 2018-04-09 18:24:11 -0700 Created attachment 337568 Patch 1414025 7 337568 commit-queue 2018-04-12 08:51:16 -0700 Comment on attachment 337568 Patch Clearing flags on attachment: 337568 Committed r230576: <https://trac.webkit.org/changeset/230576> 1414026 8 commit-queue 2018-04-12 08:51:17 -0700 All reviewed patches have been landed. Closing bug. 337411 2018-04-06 19:26:33 -0700 2018-04-09 18:24:09 -0700 Patch bug-184376-20180406212633.patch text/plain 3298 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMzU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk Mjg3MjhjYzU5YTBhZTk4MzZlYjllNTI1ZGVmMTA5MGI2ZmQ5Y2UwLi5hYWE3YjM3NTA3MTE0MjRm MmNjMjY2ZTAxMzJkZTRjNjdlZWNkZjBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAxOC0wNC0wNiAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGln YWxpYS5jb20+CisKKyAgICAgICAgW1dQRV0gSW5jbHVkZSBoaWVyYXJjaHkgaGFzIGV4dHJhIGxl dmVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQz NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBs YXRmb3JtV1BFLmNtYWtlOgorCiAyMDE4LTA0LTA1ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxl LmNvbT4KIAogICAgICAgICBNYWNyb0Fzc2VtYmxlckNvZGVQdHI6OnJldGFnZ2VkKCkgc2hvdWxk IG5vdCByZS1kZWNvcmF0ZSB0aGUgcG9pbnRlciBvbiBBUk12Ny4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZmViNWM2 ZmZjM2Q1ZjdkMWNmMmI0NWIyNjQ4MDIwOWVmNDQ0NDEwMC4uODE1MzU2MTVmNWI3ZjUxMmQ4ODM0 MGY5OTAwMDhjOWFjYzg1YjlhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxOC0wNC0w NiAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CisKKyAgICAgICAg W1dQRV0gSW5jbHVkZSBoaWVyYXJjaHkgaGFzIGV4dHJhIGxldmVsCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQzNzYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsYXRmb3JtV1BFLmNtYWtlOgorICAg ICAgICAqIHdwZS93cGUtd2Via2l0LnBjLmluOgorCiAyMDE4LTA0LTA1ICBZb3Vlbm4gRmFibGV0 ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjMwMjIzKTogTGF5 b3V0VGVzdCBodHRwL3Rlc3RzL2NvbnRlbnRleHRlbnNpb25zL2Nzcy1kaXNwbGF5LW5vbmUtb3Zl cmZsb3dzLXJ1bGUtZGF0YS0xLmh0bWwgaXMgY3Jhc2hpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9QbGF0Zm9ybVdQRS5jbWFrZSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9Q bGF0Zm9ybVdQRS5jbWFrZQppbmRleCA4NjJlNzI3Y2U3Y2M2ZTQzOTEyNzUwZTAwYzFmZWI1ZmVj ZDc4OTk1Li43ODRiNGFkMjdmMmMyNzZlY2FkOTM5ZTUyNDljMDBkZWU4ZDg0ZDA4IDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvUGxhdGZvcm1XUEUuY21ha2UKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL1BsYXRmb3JtV1BFLmNtYWtlCkBAIC0yOCwxMiArMjgsMTIgQEAgbGlz dChBUFBFTkQgSmF2YVNjcmlwdENvcmVfUFJJVkFURV9GUkFNRVdPUktfSEVBREVSUwogKQogCiBp bnN0YWxsKEZJTEVTICR7SmF2YVNjcmlwdENvcmVfUFVCTElDX0ZSQU1FV09SS19IRUFERVJTfQot ICAgIERFU1RJTkFUSU9OICIke0NNQUtFX0lOU1RBTExfSU5DTFVERURJUn0vd3BlLSR7V1BFX0FQ SV9WRVJTSU9OfS9XUEUvSmF2YVNjcmlwdENvcmUiCisgICAgREVTVElOQVRJT04gIiR7Q01BS0Vf SU5TVEFMTF9JTkNMVURFRElSfS93cGUtJHtXUEVfQVBJX1ZFUlNJT059L0phdmFTY3JpcHRDb3Jl IgogICAgIENPTVBPTkVOVCAiRGV2ZWxvcG1lbnQiCiApCiAKIGluc3RhbGwoRklMRVMgJHtKYXZh U2NyaXB0Q29yZV9JTlNUQUxMRURfSEVBREVSU30KLSAgICBERVNUSU5BVElPTiAiJHtDTUFLRV9J TlNUQUxMX0lOQ0xVREVESVJ9L3dwZS0ke1dQRV9BUElfVkVSU0lPTn0vV1BFL2pzYyIKKyAgICBE RVNUSU5BVElPTiAiJHtDTUFLRV9JTlNUQUxMX0lOQ0xVREVESVJ9L3dwZS0ke1dQRV9BUElfVkVS U0lPTn0vanNjIgogICAgIENPTVBPTkVOVCAiRGV2ZWxvcG1lbnQiCiApCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvUGxhdGZvcm1XUEUuY21ha2UgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3Jt V1BFLmNtYWtlCmluZGV4IDgyM2Q0MTZiNWZhOGVkZWI5YzAyZjc3NjkyZGI1ZGIyZjExY2QyYjEu LmI3NDMwMGNlZjM0NWRmOGZiZDQ1MTlmNTI4ZWM3ZDc5ZTJmMDkxNjIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvUGxhdGZvcm1XUEUuY21ha2UKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9y bVdQRS5jbWFrZQpAQCAtMzI3LDYgKzMyNyw2IEBAIGluc3RhbGwoRklMRVMgIiR7Q01BS0VfQklO QVJZX0RJUn0vd3BlLXdlYmtpdC5wYyIKICkKIAogaW5zdGFsbChGSUxFUyAke1dQRV9BUElfSU5T VEFMTEVEX0hFQURFUlN9Ci0gICAgREVTVElOQVRJT04gIiR7Q01BS0VfSU5TVEFMTF9JTkNMVURF RElSfS93cGUtJHtXUEVfQVBJX1ZFUlNJT059L1dQRS93cGUiCisgICAgREVTVElOQVRJT04gIiR7 Q01BS0VfSU5TVEFMTF9JTkNMVURFRElSfS93cGUtJHtXUEVfQVBJX1ZFUlNJT059L3dwZSIKICAg ICBDT01QT05FTlQgIkRldmVsb3BtZW50IgogKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93 cGUvd3BlLXdlYmtpdC5wYy5pbiBiL1NvdXJjZS9XZWJLaXQvd3BlL3dwZS13ZWJraXQucGMuaW4K aW5kZXggYTU3NjhkNmFkZThkNTkyODJhYzYzZTk3MzMwOTdlYzlmMGJmYTZhZS4uYjBhODhjYTA3 MTNmODhhMmVmM2JlZWQ5NzMwNGVjZWFjYTBiZGZjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC93cGUvd3BlLXdlYmtpdC5wYy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L3dwZS93cGUtd2Via2l0 LnBjLmluCkBAIC05LDQgKzksNCBAQCBVUkw6IGh0dHBzOi8vd3Bld2Via2l0Lm9yZwogVmVyc2lv bjogQFBST0pFQ1RfVkVSU0lPTkAKIFJlcXVpcmVzOiBnbGliLTIuMCBsaWJzb3VwLTIuNAogTGli czogLUwke2xpYmRpcn0gLWxXUEVXZWJLaXQKLUNmbGFnczogLUkke2luY2x1ZGVkaXJ9L3dwZS1A V1BFX0FQSV9WRVJTSU9OQCAtSSR7aW5jbHVkZWRpcn0vd3BlLUBXUEVfQVBJX1ZFUlNJT05AL1dQ RQorQ2ZsYWdzOiAtSSR7aW5jbHVkZWRpcn0vd3BlLUBXUEVfQVBJX1ZFUlNJT05ACg== 337568 2018-04-09 18:24:11 -0700 2018-04-12 08:51:16 -0700 Patch bug-184376-20180409202410.patch text/plain 3293 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ZWMyN2Q3Y2YxYzMxYWQ4YTEzZmEzMTQ2NDE1YmZiYzYwZTNhNzY3Li4wMTMzNGM0ODdhNmJkODYz Mzc4YWZiZDE2NzM5YjVhNjA5MTQxMWUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxOC0wNC0wOSAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGln YWxpYS5jb20+CisKKyAgICAgICAgW1dQRV0gSW1wcm92ZSBpbmNsdWRlIGhpZXJhcmNoeQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0Mzc2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5zdGFsbCBKU0Mg aGVhZGVycyB1bmRlciAvdXNyL2luY2x1ZGUvd3BlLXdlYmtpdC0wLjEvanNjIGluc3RlYWQgb2YK KyAgICAgICAgL3Vzci9pbmNsdWRlL3dwZS0wLjEvV1BFL2pzYy4KKworICAgICAgICAqIFBsYXRm b3JtV1BFLmNtYWtlOgorCiAyMDE4LTA0LTA4ICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFA Z21haWwuY29tPgogCiAgICAgICAgIFtKU0NdIEludHJvZHVjZSBAcHV0QnlJZERpcmVjdFByaXZh dGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKaW5kZXggODI5NDVkZTZkOWYwYWQzOGMzNDcyY2U2OTRmNjRhYmIxOTdhN2FhZC4u YWQ3Yjg1NGFmOGE2YmQzMzEyMzFmOTZkYTdiOTBjNDQ4ZGRhMTg1OSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxOC0wNC0wOSAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGln YWxpYS5jb20+CisKKyAgICAgICAgW1dQRV0gSW1wcm92ZSBpbmNsdWRlIGhpZXJhcmNoeQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0Mzc2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5zdGFsbCBvdXIg aGVhZGVycyB1bmRlciAvdXNyL2luY2x1ZGUvd3BlLXdlYmtpdC0wLjEvd3BlIGluc3RlYWQgb2YK KyAgICAgICAgL3Vzci9pbmNsdWRlL3dwZS0wLjEvV1BFL3dwZS4gVG9vIG11Y2ggV1BFLCBub3Qg ZW5vdWdoIFdlYktpdCEKKworICAgICAgICAqIFBsYXRmb3JtV1BFLmNtYWtlOgorICAgICAgICAq IHdwZS93cGUtd2Via2l0LnBjLmluOgorCiAyMDE4LTA0LTA5ICBCcmVudCBGdWxnaGFtICA8YmZ1 bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6dGFyZ2V0 UG9zaXRpb25JbldpbmRvd0ZvclNlbGVjdGlvbkF1dG9zY3JvbGwgaXMgZGlyZWN0bHkgYWNjZXNz aW5nIE5TU2NyZWVuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvUGxhdGZvcm1X UEUuY21ha2UgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvUGxhdGZvcm1XUEUuY21ha2UKaW5kZXgg NGRiZWNlM2E5YWE0Yjk0ZjA0ZDlkNjllYWE0YTNiMGVhOGMyNmZjMS4uYWI5Nzk1MzdiODhhY2Yz MDg1MGY1MjVjZTgwMjU2MTEwNWJmNDQzMCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL1BsYXRmb3JtV1BFLmNtYWtlCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9QbGF0Zm9y bVdQRS5jbWFrZQpAQCAtMjgsNyArMjgsNyBAQCBsaXN0KEFQUEVORCBKYXZhU2NyaXB0Q29yZV9Q UklWQVRFX0ZSQU1FV09SS19IRUFERVJTCiApCiAKIGluc3RhbGwoRklMRVMgJHtKYXZhU2NyaXB0 Q29yZV9JTlNUQUxMRURfSEVBREVSU30KLSAgICBERVNUSU5BVElPTiAiJHtDTUFLRV9JTlNUQUxM X0lOQ0xVREVESVJ9L3dwZS0ke1dQRV9BUElfVkVSU0lPTn0vV1BFL2pzYyIKKyAgICBERVNUSU5B VElPTiAiJHtDTUFLRV9JTlNUQUxMX0lOQ0xVREVESVJ9L3dwZS13ZWJraXQtJHtXUEVfQVBJX1ZF UlNJT059L2pzYyIKICAgICBDT01QT05FTlQgIkRldmVsb3BtZW50IgogKQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtV1BFLmNtYWtlIGIvU291cmNlL1dlYktpdC9QbGF0Zm9y bVdQRS5jbWFrZQppbmRleCA1Njc0MDE5NWQ0NTM5MWYwODY1MWM5NzQwZjM5MzI1MTdmMTgyY2Y5 Li4zOTFlZDAwNTRmZjE3YzIwNGQ1M2YzNzA5MmRhMGE3MDY1YmJkNDA1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1BsYXRmb3JtV1BFLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZv cm1XUEUuY21ha2UKQEAgLTMyOCw2ICszMjgsNiBAQCBpbnN0YWxsKEZJTEVTICIke0NNQUtFX0JJ TkFSWV9ESVJ9L3dwZS13ZWJraXQtJHtXUEVfQVBJX1ZFUlNJT059LnBjIgogKQogCiBpbnN0YWxs KEZJTEVTICR7V1BFX0FQSV9JTlNUQUxMRURfSEVBREVSU30KLSAgICBERVNUSU5BVElPTiAiJHtD TUFLRV9JTlNUQUxMX0lOQ0xVREVESVJ9L3dwZS0ke1dQRV9BUElfVkVSU0lPTn0vV1BFL3dwZSIK KyAgICBERVNUSU5BVElPTiAiJHtDTUFLRV9JTlNUQUxMX0lOQ0xVREVESVJ9L3dwZS13ZWJraXQt JHtXUEVfQVBJX1ZFUlNJT059L3dwZSIKICAgICBDT01QT05FTlQgIkRldmVsb3BtZW50IgogKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93cGUvd3BlLXdlYmtpdC5wYy5pbiBiL1NvdXJjZS9X ZWJLaXQvd3BlL3dwZS13ZWJraXQucGMuaW4KaW5kZXggNDQ5YWQwZmM5NDRkYjUwMmI2NTBjOTBi NjRjZGUwZjcwNWRhNzA5NC4uNGM2NmZkY2U1MDg4M2EwNmRjMzVlOTVlNjhhMzEwMjMwZDA5YjBi MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93cGUvd3BlLXdlYmtpdC5wYy5pbgorKysgYi9T b3VyY2UvV2ViS2l0L3dwZS93cGUtd2Via2l0LnBjLmluCkBAIC05LDQgKzksNCBAQCBVUkw6IGh0 dHBzOi8vd3Bld2Via2l0Lm9yZwogVmVyc2lvbjogQFBST0pFQ1RfVkVSU0lPTkAKIFJlcXVpcmVz OiBnbGliLTIuMCBsaWJzb3VwLTIuNAogTGliczogLUwke2xpYmRpcn0gLWxXUEVXZWJLaXQtQFdQ RV9BUElfVkVSU0lPTkAKLUNmbGFnczogLUkke2luY2x1ZGVkaXJ9L3dwZS1AV1BFX0FQSV9WRVJT SU9OQCAtSSR7aW5jbHVkZWRpcn0vd3BlLUBXUEVfQVBJX1ZFUlNJT05AL1dQRQorQ2ZsYWdzOiAt SSR7aW5jbHVkZWRpcn0vd3BlLXdlYmtpdC1AV1BFX0FQSV9WRVJTSU9OQAo=