162493 2016-09-23 09:32:03 -0700 Fix Mac CMake build after r206261 2016-10-12 11:35:29 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jbedard jbedard achristensen cgarcia commit-queue dbates jeremyhu lforschler mcatanzaro oldest_to_newest 1232876 0 jbedard 2016-09-23 09:32:03 -0700 Build fix for Mac CMake. 1232880 1 289685 jbedard 2016-09-23 09:36:01 -0700 Created attachment 289685 Patch 1232881 2 jbedard 2016-09-23 09:37:34 -0700 Still in the process of testing this patch locally. Unless others find this fix urgent and indicate so, I will not commit it until local testing confirms it's working. 1232924 3 jbedard 2016-09-23 11:39:50 -0700 Locally confirmed that this patch allows Mac CMake to build. 1232954 4 289685 dbates 2016-09-23 13:17:02 -0700 Comment on attachment 289685 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=289685&action=review > Source/WebKit2/CMakeLists.txt:664 > +if (NOT APPLE) Is this the preferred way to add files to non-Apple ports? I thought we prefer to keep the purpose of this file for platform-independent files and put platform-specific files in the appropriate Platform*.cmake files. > Source/WebKit2/CMakeLists.txt:666 > + set(WebKit2_SOURCES > + ${WebKit2_SOURCES} Notice that list(APPEND ...) can be used to append elements to the end of a list [1]. I suggest that we make use of this function to append WebTextChecker.cpp and WebTextCheckerClient.cpp to the end of the list. [1] <https://cmake.org/cmake/help/v3.0/command/list.html> 1232961 5 289685 achristensen 2016-09-23 13:19:51 -0700 Comment on attachment 289685 Patch Yes, these files should just be moved to PlatformGTK.cmake and PlatformEFL.cmake. 1232980 6 289705 jbedard 2016-09-23 13:48:38 -0700 Created attachment 289705 Patch 1232992 7 289705 commit-queue 2016-09-23 14:22:36 -0700 Comment on attachment 289705 Patch Clearing flags on attachment: 289705 Committed r206331: <http://trac.webkit.org/changeset/206331> 1232993 8 commit-queue 2016-09-23 14:22:40 -0700 All reviewed patches have been landed. Closing bug. 1239391 9 jeremyhu 2016-10-12 11:35:29 -0700 So that addresses the problem on !APPLE platforms, but the issue still remains on darwin because of the incorrect preprocessor checks. I filed a ticket to track that followup in: https://bugs.webkit.org/show_bug.cgi?id=163346 289685 2016-09-23 09:36:01 -0700 2016-09-23 13:48:35 -0700 Patch bug-162493-20160923093310.patch text/plain 1557 jbedard SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNjMwOSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDE2LTA5LTIzICBKb25hdGhh biBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggTWFjIENNYWtlIGJ1 aWxkIGFmdGVyIHIyMDYyNjEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE2MjQ5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6IEV4Y2x1ZGUgV2ViVGV4dENoZWNrZXIgZnJvbSBN YWMgQ01ha2UgYnVpbGRzLgorCiAyMDE2LTA5LTIzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBCYWREYW1hZ2UgWCBlcnJvciBpbiAv d2Via2l0Mi9XZWJLaXRXZWJWaWV3L3ByZWZlcnJlZC1zaXplCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9DTWFrZUxpc3RzLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DTWFrZUxpc3Rz LnR4dAkocmV2aXNpb24gMjA2MzA1KQorKysgU291cmNlL1dlYktpdDIvQ01ha2VMaXN0cy50eHQJ KHdvcmtpbmcgY29weSkKQEAgLTQwMCw4ICs0MDAsNiBAQCBzZXQoV2ViS2l0Ml9TT1VSQ0VTCiAg ICAgVUlQcm9jZXNzL1dlYlByb2Nlc3NMaWZldGltZVRyYWNrZXIuY3BwCiAgICAgVUlQcm9jZXNz L1dlYlByb2Nlc3NQb29sLmNwcAogICAgIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCi0g ICAgVUlQcm9jZXNzL1dlYlRleHRDaGVja2VyLmNwcAotICAgIFVJUHJvY2Vzcy9XZWJUZXh0Q2hl Y2tlckNsaWVudC5jcHAKICAgICBVSVByb2Nlc3MvV2ViVmlicmF0aW9uUHJvdmlkZXIuY3BwCiAg ICAgVUlQcm9jZXNzL1dlYlZpYnJhdGlvblByb3h5LmNwcAogICAgIFVJUHJvY2Vzcy9XZWJWaWV3 cG9ydEF0dHJpYnV0ZXMuY3BwCkBAIC02NjMsNiArNjYxLDE0IEBAIHNldChXZWJLaXQyX1NPVVJD RVMKICAgICAke05ldHdvcmtQcm9jZXNzX0NPTU1PTl9TT1VSQ0VTfQogKQogCitpZiAoTk9UIEFQ UExFKQorICAgIHNldChXZWJLaXQyX1NPVVJDRVMKKyAgICAgICAgJHtXZWJLaXQyX1NPVVJDRVN9 CisgICAgICAgIFVJUHJvY2Vzcy9XZWJUZXh0Q2hlY2tlci5jcHAKKyAgICAgICAgVUlQcm9jZXNz L1dlYlRleHRDaGVja2VyQ2xpZW50LmNwcAorICAgICkKK2VuZGlmICgpCisKIHNldChXZWJLaXQy X01FU1NBR0VTX0lOX0ZJTEVTCiAgICAgRGF0YWJhc2VQcm9jZXNzL0RhdGFiYXNlUHJvY2Vzcy5t ZXNzYWdlcy5pbgogICAgIERhdGFiYXNlUHJvY2Vzcy9EYXRhYmFzZVRvV2ViUHJvY2Vzc0Nvbm5l Y3Rpb24ubWVzc2FnZXMuaW4K 289705 2016-09-23 13:48:38 -0700 2016-09-23 14:22:36 -0700 Patch bug-162493-20160923134546.patch text/plain 2291 jbedard SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNjMyNykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE2LTA5LTIzICBKb25hdGhh biBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggTWFjIENNYWtlIGJ1 aWxkIGFmdGVyIHIyMDYyNjEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE2MjQ5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6IEV4Y2x1ZGUgV2ViVGV4dENoZWNrZXIgZnJvbSBN YWMgQ01ha2UgYnVpbGRzLgorICAgICAgICAqIFBsYXRmb3JtRWZsLmNtYWtlOiBEaXR0by4KKyAg ICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZTogRGl0dG8uCisKIDIwMTYtMDktMjMgIENhcmxvcyBH YXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIEJhZERh bWFnZSBYIGVycm9yIGluIC93ZWJraXQyL1dlYktpdFdlYlZpZXcvcHJlZmVycmVkLXNpemUKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL0NNYWtlTGlzdHMudHh0Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL0NNYWtlTGlzdHMudHh0CShyZXZpc2lvbiAyMDYzMjYpCisrKyBTb3VyY2UvV2ViS2l0 Mi9DTWFrZUxpc3RzLnR4dAkod29ya2luZyBjb3B5KQpAQCAtNDAwLDggKzQwMCw2IEBAIHNldChX ZWJLaXQyX1NPVVJDRVMKICAgICBVSVByb2Nlc3MvV2ViUHJvY2Vzc0xpZmV0aW1lVHJhY2tlci5j cHAKICAgICBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCiAgICAgVUlQcm9jZXNzL1dlYlBy b2Nlc3NQcm94eS5jcHAKLSAgICBVSVByb2Nlc3MvV2ViVGV4dENoZWNrZXIuY3BwCi0gICAgVUlQ cm9jZXNzL1dlYlRleHRDaGVja2VyQ2xpZW50LmNwcAogICAgIFVJUHJvY2Vzcy9XZWJWaWJyYXRp b25Qcm92aWRlci5jcHAKICAgICBVSVByb2Nlc3MvV2ViVmlicmF0aW9uUHJveHkuY3BwCiAgICAg VUlQcm9jZXNzL1dlYlZpZXdwb3J0QXR0cmlidXRlcy5jcHAKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1BsYXRmb3JtRWZsLmNtYWtlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsYXRmb3Jt RWZsLmNtYWtlCShyZXZpc2lvbiAyMDYzMjYpCisrKyBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUVm bC5jbWFrZQkod29ya2luZyBjb3B5KQpAQCAtNjQsNiArNjQsOCBAQCBsaXN0KEFQUEVORCBXZWJL aXQyX1NPVVJDRVMKICAgICBVSVByb2Nlc3MvRGVmYXVsdFVuZG9Db250cm9sbGVyLmNwcAogICAg IFVJUHJvY2Vzcy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmdOb25lLmNwcAogICAgIFVJUHJvY2Vz cy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisgICAgVUlQcm9jZXNzL1dlYlRl eHRDaGVja2VyLmNwcAorICAgIFVJUHJvY2Vzcy9XZWJUZXh0Q2hlY2tlckNsaWVudC5jcHAKIAog ICAgIFVJUHJvY2Vzcy9BUEkvQy9Db29yZGluYXRlZEdyYXBoaWNzL1dLVmlldy5jcHAKIApJbmRl eDogU291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UJKHJldmlzaW9uIDIwNjMyNikKKysrIFNvdXJjZS9X ZWJLaXQyL1BsYXRmb3JtR1RLLmNtYWtlCSh3b3JraW5nIGNvcHkpCkBAIC05MCw2ICs5MCw4IEBA IGxpc3QoQVBQRU5EIFdlYktpdDJfU09VUkNFUwogICAgIFVJUHJvY2Vzcy9EcmF3aW5nQXJlYVBy b3h5SW1wbC5jcHAKICAgICBVSVByb2Nlc3MvTGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5nTm9uZS5j cHAKICAgICBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAorICAg IFVJUHJvY2Vzcy9XZWJUZXh0Q2hlY2tlci5jcHAKKyAgICBVSVByb2Nlc3MvV2ViVGV4dENoZWNr ZXJDbGllbnQuY3BwCiAKICAgICBVSVByb2Nlc3MvQVBJL0MvY2Fpcm8vV0tJY29uRGF0YWJhc2VD YWlyby5jcHAKIAo=