browser(webkit): rebase to 08/11/22 (253363@main) (#16490)
This commit is contained in:
parent
13f210a1e8
commit
dc07a60f14
|
|
@ -1,2 +1,2 @@
|
||||||
1699
|
1700
|
||||||
Changed: yurys@chromium.org Mon 08 Aug 2022 12:23:32 PM PDT
|
Changed: dpino@igalia.com Fri Aug 12 16:04:10 UTC 2022
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
REMOTE_URL="https://github.com/WebKit/WebKit.git"
|
REMOTE_URL="https://github.com/WebKit/WebKit.git"
|
||||||
BASE_BRANCH="main"
|
BASE_BRANCH="main"
|
||||||
BASE_REVISION="df7f18952ccf0421dbdc7ee63587f59dbc7bd8ef"
|
BASE_REVISION="f6b396ad7232f2f99822cfd5573cdc1798aa52d8"
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,19 @@ cd "$(dirname "$0")"
|
||||||
SCRIPT_FOLDER="$(pwd -P)"
|
SCRIPT_FOLDER="$(pwd -P)"
|
||||||
source "${SCRIPT_FOLDER}/../utils.sh"
|
source "${SCRIPT_FOLDER}/../utils.sh"
|
||||||
|
|
||||||
|
is_ubuntu_18_04() {
|
||||||
|
local id version_id
|
||||||
|
|
||||||
|
if [[ -f "/etc/os-release" ]]; then
|
||||||
|
id=$(cat /etc/os-release | sed -n -r "s|^ID=(.*)$|\1|p")
|
||||||
|
version_id=$(cat /etc/os-release | sed -n -r "s|^VERSION_ID=\"(.*)\"$|\1|p")
|
||||||
|
|
||||||
|
[[ "$id" == "ubuntu" && "$version_id" == "18.04" ]]
|
||||||
|
else
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
build_gtk() {
|
build_gtk() {
|
||||||
if [[ ! -d "./WebKitBuild/GTK/DependenciesGTK" ]]; then
|
if [[ ! -d "./WebKitBuild/GTK/DependenciesGTK" ]]; then
|
||||||
yes | WEBKIT_JHBUILD=1 \
|
yes | WEBKIT_JHBUILD=1 \
|
||||||
|
|
@ -19,6 +32,9 @@ build_gtk() {
|
||||||
--cmakeargs=-DENABLE_INTROSPECTION=OFF
|
--cmakeargs=-DENABLE_INTROSPECTION=OFF
|
||||||
--cmakeargs=-DUSE_GSTREAMER_WEBRTC=FALSE
|
--cmakeargs=-DUSE_GSTREAMER_WEBRTC=FALSE
|
||||||
)
|
)
|
||||||
|
if is_ubuntu_18_04; then
|
||||||
|
CMAKE_ARGS+=("--cmakeargs=-DUSE_SYSTEM_MALLOC=ON")
|
||||||
|
fi
|
||||||
if [[ -n "${EXPORT_COMPILE_COMMANDS}" ]]; then
|
if [[ -n "${EXPORT_COMPILE_COMMANDS}" ]]; then
|
||||||
CMAKE_ARGS+=("--cmakeargs=-DCMAKE_EXPORT_COMPILE_COMMANDS=1")
|
CMAKE_ARGS+=("--cmakeargs=-DCMAKE_EXPORT_COMPILE_COMMANDS=1")
|
||||||
fi
|
fi
|
||||||
|
|
@ -42,6 +58,9 @@ build_wpe() {
|
||||||
--cmakeargs=-DENABLE_WEBXR=OFF
|
--cmakeargs=-DENABLE_WEBXR=OFF
|
||||||
--cmakeargs=-DUSE_GSTREAMER_WEBRTC=FALSE
|
--cmakeargs=-DUSE_GSTREAMER_WEBRTC=FALSE
|
||||||
)
|
)
|
||||||
|
if is_ubuntu_18_04; then
|
||||||
|
CMAKE_ARGS+=("--cmakeargs=-DUSE_SYSTEM_MALLOC=ON")
|
||||||
|
fi
|
||||||
if [[ -n "${EXPORT_COMPILE_COMMANDS}" ]]; then
|
if [[ -n "${EXPORT_COMPILE_COMMANDS}" ]]; then
|
||||||
CMAKE_ARGS+=("--cmakeargs=-DCMAKE_EXPORT_COMPILE_COMMANDS=1")
|
CMAKE_ARGS+=("--cmakeargs=-DCMAKE_EXPORT_COMPILE_COMMANDS=1")
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue