170346 2017-03-31 09:36:36 -0700 Mac cmake buildfix after r214403 2017-03-31 10:28:47 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 169168 1 ossy ossy achristensen commit-queue ossy thorton wenson_hsieh oldest_to_newest 1293181 0 ossy 2017-03-31 09:36:36 -0700 https://trac.webkit.org/changeset/214403/webkit broke the Apple Mac cmake build 6 days ago, let's try to fix it. build log: In file included from /Volumes/Data/slave/elcapitan-cmake-debug/build/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:83: In file included from /Volumes/Data/slave/elcapitan-cmake-debug/build/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h:32: /Volumes/Data/slave/elcapitan-cmake-debug/build/Source/WebKit2/Shared/API/Cocoa/WKDragDestinationAction.h:33:5: error: redefinition of enumerator 'WKDragDestinationActionNone' WKDragDestinationActionNone = 0, ^ /Volumes/Data/slave/elcapitan-cmake-debug/build/Source/WebKit2/Shared/API/Cocoa/WKDragDestinationAction.h:33:5: note: previous definition is here WKDragDestinationActionNone = 0, ^ In file included from /Volumes/Data/slave/elcapitan-cmake-debug/build/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:83: In file included from /Volumes/Data/slave/elcapitan-cmake-debug/build/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h:32: /Volumes/Data/slave/elcapitan-cmake-debug/build/Source/WebKit2/Shared/API/Cocoa/WKDragDestinationAction.h:34:5: error: redefinition of enumerator 'WKDragDestinationActionDHTML' WKDragDestinationActionDHTML = 1, ^ /Volumes/Data/slave/elcapitan-cmake-debug/build/Source/WebKit2/Shared/API/Cocoa/WKDragDestinationAction.h:34:5: note: previous definition is here WKDragDestinationActionDHTML = 1, ^ ... 1293182 1 305975 ossy 2017-03-31 09:37:46 -0700 Created attachment 305975 Patch 1293198 2 305975 commit-queue 2017-03-31 10:28:46 -0700 Comment on attachment 305975 Patch Clearing flags on attachment: 305975 Committed r214672: <http://trac.webkit.org/changeset/214672> 1293199 3 commit-queue 2017-03-31 10:28:47 -0700 All reviewed patches have been landed. Closing bug. 305975 2017-03-31 09:37:46 -0700 2017-03-31 10:28:46 -0700 Patch bug-170346-20170331183744.patch text/plain 1236 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0NjY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTVjMmExOGM1OWY4M2Y5 NGFiYzNiYTEwYTkzYTY2MTM5ZjFkNWZjYy4uZmRhOGQ1OGZlYjY4NTY0ZTI3Y2FjZTJkOWI4MzIz NzM2MzFjMzliYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE3LTAzLTMxICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFjIGNtYWtlIGJ1 aWxkZml4IGFmdGVyIHIyMTQ0MDMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE3MDM0NgorCisgICAgICAgIFVucmV2aWV3ZWQgc3BlY3VsYXRpdmUgYnVp bGRmaXguCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKwog MjAxNy0wMy0zMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAK ICAgICAgICAgTW9kZXJuIG1lZGlhIGNvbnRyb2xzIHNob3VsZCBuZXZlciBiZSBlbmFibGVkIGlu IG5vbiBjb2NvYSBwb3J0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlldy5tbQppbmRleCA0YzNiNjRiZmJkZmE4ODk0YmRmYzcyYTI2MjQzMmRkZWQzMzNj MmJhLi5kODIwYjAzMWJmNjk5NmVhZDUyYjNlMzI2N2Q0YmYwYjQ3MzI5ZTFmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtNTIsNiAr NTIsNyBAQAogI2ltcG9ydCAiV0tCYWNrRm9yd2FyZExpc3RJdGVtSW50ZXJuYWwuaCIKICNpbXBv cnQgIldLQnJvd3NpbmdDb250ZXh0SGFuZGxlSW50ZXJuYWwuaCIKICNpbXBvcnQgIldLRGF0YURl dGVjdG9yVHlwZXNJbnRlcm5hbC5oIgorI2ltcG9ydCAiV0tEcmFnRGVzdGluYXRpb25BY3Rpb24u aCIKICNpbXBvcnQgIldLRXJyb3JJbnRlcm5hbC5oIgogI2ltcG9ydCAiV0tIaXN0b3J5RGVsZWdh dGVQcml2YXRlLmgiCiAjaW1wb3J0ICJXS0xheW91dE1vZGUuaCIK