Bug 208770

Summary:

[CMake] Some fixes for building Mac port

Product:

WebKit

Reporter:

Konstantin Tokarev <annulen>

Component:

CMake

Assignee:

Konstantin Tokarev <annulen>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

achristensen, commit-queue, don.olmstead, ews-watchlist, gyuyoung.kim, ryuan.choi, sergio, thorton, ysuzuki

Priority:

Version:

WebKit Nightly Build

Hardware:

Unspecified

OS:

Unspecified

Attachments:

Description	Flags
Patch	none
Patch for landing	commit-queue: commit-queue-

Konstantin Tokarev

Reported 2020-03-07 12:54:03 PST

Some files were moved, renamed, and deleted.

Attachments
Patch (5.49 KB, patch) 2020-03-07 13:04 PST, Konstantin Tokarev	no flags	Details Formatted Diff Diff
Patch for landing (5.19 KB, patch) 2020-03-08 14:23 PDT, Konstantin Tokarev	commit-queue: commit-queue-	Details Formatted Diff Diff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.

Konstantin Tokarev

Comment 1 2020-03-07 13:04:43 PST

Created attachment 392881 [details] Patch

WebKit Commit Bot

Comment 2 2020-03-07 14:49:07 PST

Comment on attachment 392881 [details] Patch Rejecting attachment 392881 [details] from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'validate-changelog', '--check-oops', '--non-interactive', 392881, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit /Volumes/Data/EWS/WebKit/Source/WebCore/PAL/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: https://webkit-queues.webkit.org/results/13335615

Konstantin Tokarev

Comment 3 2020-03-08 14:23:16 PDT

Created attachment 392986 [details] Patch for landing

WebKit Commit Bot

Comment 4 2020-03-08 15:12:14 PDT

Comment on attachment 392986 [details] Patch for landing Rejecting attachment 392986 [details] from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 392986, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=392986&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=208770&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 392986 from bug 208770. Fetching: https://bugs.webkit.org/attachment.cgi?id=392986 Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 8 diffs from patch file(s). patching file Source/WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/PlatformMac.cmake patching file Source/WebCore/PAL/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/PAL/pal/PlatformMac.cmake Hunk #1 FAILED at 20. Hunk #2 succeeded at 66 (offset 2 lines). Hunk #3 succeeded at 97 (offset 2 lines). 1 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/PAL/pal/PlatformMac.cmake.rej patching file Source/WebKit/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebKit/PlatformMac.cmake patching file Source/WebKitLegacy/ChangeLog patching file Source/WebKitLegacy/PlatformMac.cmake Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 8 diffs from patch file(s). patching file Source/WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/PlatformMac.cmake patching file Source/WebCore/PAL/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/PAL/pal/PlatformMac.cmake Hunk #1 FAILED at 20. Hunk #2 succeeded at 66 (offset 2 lines). Hunk #3 succeeded at 97 (offset 2 lines). 1 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/PAL/pal/PlatformMac.cmake.rej patching file Source/WebKit/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebKit/PlatformMac.cmake patching file Source/WebKitLegacy/ChangeLog patching file Source/WebKitLegacy/PlatformMac.cmake Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource From git://git.webkit.org/WebKit 9b7f8252cc4..1ba83b0819a master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 258113 = 9b7f8252cc4acf27b2ce5fef6e2bacce8248d587 r258114 = db7ac5410a8379af26423a9a3246d92c5666b77f r258115 = 1ba83b0819a80a376a1e61abe52d6e261b79c78e Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: https://webkit-queues.webkit.org/results/13336192

Konstantin Tokarev

Comment 5 2020-03-08 15:17:32 PDT

Meh, conflicting patch was landed minutes ago :/

Konstantin Tokarev

Comment 6 2020-03-08 15:33:33 PDT

Committed r258116: <https://trac.webkit.org/changeset/258116>

Note You need to log in before you can comment on or make changes to this bug.