browser(webkit): roll to 01-05 to pick up upstream Win fix (#4894)

This commit is contained in:
Yury Semikhatsky 2021-01-05 13:08:52 -08:00 committed by GitHub
parent 0f8d7ec0a6
commit 5df1c6e560
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 8 deletions

View file

@ -1,2 +1,2 @@
1413
Changed: yurys@chromium.org Mon 04 Jan 2021 02:16:49 PM PST
1414
Changed: yurys@chromium.org Tue 05 Jan 2021 09:15:48 AM PST

View file

@ -1,3 +1,3 @@
REMOTE_URL="https://git.webkit.org/git/WebKit.git"
BASE_BRANCH="master"
BASE_REVISION="f73092d4a81ef44ed4933e45e94bc56dc30b09b3"
BASE_REVISION="6ea179577ec78080e01bfa6b12e5d5c9c3970324"

View file

@ -70,10 +70,6 @@ elif [[ "$(uname)" == "Linux" ]]; then
build_wpe
fi
elif [[ "$(uname)" == MINGW* ]]; then
/c/Windows/System32/cmd.exe "/c $(cygpath -w ${SCRIPT_FOLDER}/buildwin.bat)" ||
# Run build step twice on Windows to work around adjust-angle-include-paths.py not
# being called at right time. See
# https://github.com/WebKit/WebKit/commit/e9a19fe7e3c245252be6ed70c86639d09227a6dc
/c/Windows/System32/cmd.exe "/c $(cygpath -w ${SCRIPT_FOLDER}/buildwin.bat)"
else
echo "ERROR: cannot upload on this platform!" 1>&2

View file

@ -18225,7 +18225,7 @@ index 830b971a4818ab500e7dc07b152c656c97645b8a..79105332b3df7d51bd915b67d5cab07f
# Finalize the value for all options. Do not attempt to use an option before
diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
index bbb1bc783000214ca469ea232314637dd4063573..20866bbcc6cec6d6df7cb44ff3da95c31a69587f 100644
index fd24a41ff19075b1e509197f18140e5a8034c9e1..0ee68ebd7439711b635a14a85c4e90e3027d1d9f 100644
--- a/Source/cmake/OptionsWPE.cmake
+++ b/Source/cmake/OptionsWPE.cmake
@@ -3,6 +3,7 @@ include(VersioningUtils)