Fixes #3167
This commit is contained in:
parent
e37514b43c
commit
049bcfbd4b
|
|
@ -33,7 +33,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "webkit",
|
"name": "webkit",
|
||||||
"revision": "1681",
|
"revision": "1682",
|
||||||
"installByDefault": true,
|
"installByDefault": true,
|
||||||
"revisionOverrides": {
|
"revisionOverrides": {
|
||||||
"mac10.14": "1446",
|
"mac10.14": "1446",
|
||||||
|
|
|
||||||
|
|
@ -184,7 +184,7 @@ const DOWNLOAD_PATHS = {
|
||||||
'ubuntu18.04-arm64': undefined,
|
'ubuntu18.04-arm64': undefined,
|
||||||
'ubuntu20.04-arm64': 'builds/webkit/%s/webkit-ubuntu-20.04-arm64.zip',
|
'ubuntu20.04-arm64': 'builds/webkit/%s/webkit-ubuntu-20.04-arm64.zip',
|
||||||
'ubuntu22.04-arm64': 'builds/webkit/%s/webkit-ubuntu-22.04-arm64.zip',
|
'ubuntu22.04-arm64': 'builds/webkit/%s/webkit-ubuntu-22.04-arm64.zip',
|
||||||
'debian11': 'builds/webkit/%s/webkit-linux-universal.zip',
|
'debian11': 'builds/webkit/%s/webkit-debian-11.zip',
|
||||||
'mac10.13': undefined,
|
'mac10.13': undefined,
|
||||||
'mac10.14': 'builds/deprecated-webkit-mac-10.14/%s/deprecated-webkit-mac-10.14.zip',
|
'mac10.14': 'builds/deprecated-webkit-mac-10.14/%s/deprecated-webkit-mac-10.14.zip',
|
||||||
'mac10.15': 'builds/webkit/%s/webkit-mac-10.15.zip',
|
'mac10.15': 'builds/webkit/%s/webkit-mac-10.15.zip',
|
||||||
|
|
@ -618,11 +618,6 @@ export class Registry {
|
||||||
if (browserName === 'firefox' && distributionInfo?.id === 'ubuntu' && distributionInfo?.version === '16.04')
|
if (browserName === 'firefox' && distributionInfo?.id === 'ubuntu' && distributionInfo?.version === '16.04')
|
||||||
throw new Error(`Cannot launch Firefox on Ubuntu 16.04! Minimum required Ubuntu version for Firefox browser is 18.04`);
|
throw new Error(`Cannot launch Firefox on Ubuntu 16.04! Minimum required Ubuntu version for Firefox browser is 18.04`);
|
||||||
|
|
||||||
// Skip dependency validation for WebKit on non-ubuntu distributions since it takes
|
|
||||||
// forever and is not needed due to universal build.
|
|
||||||
if (os.platform() === 'linux' && browserName === 'webkit' && distributionInfo?.id !== 'ubuntu')
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (os.platform() === 'linux')
|
if (os.platform() === 'linux')
|
||||||
return await validateDependenciesLinux(sdkLanguage, linuxLddDirectories.map(d => path.join(browserDirectory, d)), dlOpenLibraries);
|
return await validateDependenciesLinux(sdkLanguage, linuxLddDirectories.map(d => path.join(browserDirectory, d)), dlOpenLibraries);
|
||||||
if (os.platform() === 'win32' && os.arch() === 'x64')
|
if (os.platform() === 'win32' && os.arch() === 'x64')
|
||||||
|
|
|
||||||
|
|
@ -717,30 +717,79 @@ export const deps: any = {
|
||||||
'libxtst6'
|
'libxtst6'
|
||||||
],
|
],
|
||||||
webkit: [
|
webkit: [
|
||||||
// We use universal build on debian so webkit does not require any dependencies.
|
'libatk-bridge2.0-0',
|
||||||
|
'libatk1.0-0',
|
||||||
|
'libcairo2',
|
||||||
|
'libdbus-1-3',
|
||||||
|
'libdrm2',
|
||||||
|
'libegl1',
|
||||||
|
'libenchant-2-2',
|
||||||
|
'libepoxy0',
|
||||||
|
'libevdev2',
|
||||||
|
'libfontconfig1',
|
||||||
|
'libfreetype6',
|
||||||
|
'libgbm1',
|
||||||
|
'libgdk-pixbuf-2.0-0',
|
||||||
|
'libgles2',
|
||||||
|
'libglib2.0-0',
|
||||||
|
'libglx0',
|
||||||
|
'libgstreamer-gl1.0-0',
|
||||||
|
'libgstreamer-plugins-base1.0-0',
|
||||||
|
'libgstreamer1.0-0',
|
||||||
|
'libgtk-3-0',
|
||||||
|
'libgudev-1.0-0',
|
||||||
|
'libharfbuzz-icu0',
|
||||||
|
'libharfbuzz0b',
|
||||||
|
'libhyphen0',
|
||||||
|
'libicu67',
|
||||||
|
'libjavascriptcoregtk-4.0-18',
|
||||||
|
'libjpeg62-turbo',
|
||||||
|
'liblcms2-2',
|
||||||
|
'libmanette-0.2-0',
|
||||||
|
'libnotify4',
|
||||||
|
'libopengl0',
|
||||||
|
'libopenjp2-7',
|
||||||
|
'libopus0',
|
||||||
|
'libpango-1.0-0',
|
||||||
|
'libpng16-16',
|
||||||
|
'libproxy1v5',
|
||||||
|
'libsecret-1-0',
|
||||||
|
'libsoup2.4-1',
|
||||||
|
'libwayland-client0',
|
||||||
|
'libwayland-egl1',
|
||||||
|
'libwayland-server0',
|
||||||
|
'libwebkit2gtk-4.0-37',
|
||||||
|
'libwebp6',
|
||||||
|
'libwebpdemux2',
|
||||||
|
'libwoff1',
|
||||||
|
'libwpe-1.0-1',
|
||||||
|
'libwpebackend-fdo-1.0-1',
|
||||||
|
'libwpewebkit-1.0-3',
|
||||||
|
'libx11-6',
|
||||||
|
'libxcomposite1',
|
||||||
|
'libxdamage1',
|
||||||
|
'libxkbcommon0',
|
||||||
|
'libxml2',
|
||||||
|
'libxslt1.1'
|
||||||
],
|
],
|
||||||
lib2package: {
|
lib2package: {
|
||||||
'libasound.so.2': 'libasound2',
|
'libasound.so.2': 'libasound2',
|
||||||
'libatk-1.0.so.0': 'libatk1.0-0',
|
'libatk-1.0.so.0': 'libatk1.0-0',
|
||||||
'libatk-bridge-2.0.so.0': 'libatk-bridge2.0-0',
|
'libatk-bridge-2.0.so.0': 'libatk-bridge2.0-0',
|
||||||
'libatomic.so.1': 'libatomic1',
|
|
||||||
'libatspi.so.0': 'libatspi2.0-0',
|
'libatspi.so.0': 'libatspi2.0-0',
|
||||||
'libc.so.6': 'libc6',
|
|
||||||
'libcairo-gobject.so.2': 'libcairo-gobject2',
|
'libcairo-gobject.so.2': 'libcairo-gobject2',
|
||||||
'libcairo.so.2': 'libcairo2',
|
'libcairo.so.2': 'libcairo2',
|
||||||
'libcups.so.2': 'libcups2',
|
'libcups.so.2': 'libcups2',
|
||||||
'libdbus-1.so.3': 'libdbus-1-3',
|
'libdbus-1.so.3': 'libdbus-1-3',
|
||||||
'libdbus-glib-1.so.2': 'libdbus-glib-1-2',
|
'libdbus-glib-1.so.2': 'libdbus-glib-1-2',
|
||||||
'libdl.so.2': 'libc6',
|
|
||||||
'libdrm.so.2': 'libdrm2',
|
'libdrm.so.2': 'libdrm2',
|
||||||
'libEGL.so.1': 'libegl1',
|
'libEGL.so.1': 'libegl1',
|
||||||
'libenchant-2.so.2': 'libenchant-2-2',
|
'libenchant-2.so.2': 'libenchant-2-2',
|
||||||
'libepoxy.so.0': 'libepoxy0',
|
'libepoxy.so.0': 'libepoxy0',
|
||||||
|
'libevdev.so.2': 'libevdev2',
|
||||||
'libfontconfig.so.1': 'libfontconfig1',
|
'libfontconfig.so.1': 'libfontconfig1',
|
||||||
'libfreetype.so.6': 'libfreetype6',
|
'libfreetype.so.6': 'libfreetype6',
|
||||||
'libgbm.so.1': 'libgbm1',
|
'libgbm.so.1': 'libgbm1',
|
||||||
'libgcc_s.so.1': 'libgcc-s1',
|
|
||||||
'libgcrypt.so.20': 'libgcrypt20',
|
|
||||||
'libgdk_pixbuf-2.0.so.0': 'libgdk-pixbuf-2.0-0',
|
'libgdk_pixbuf-2.0.so.0': 'libgdk-pixbuf-2.0-0',
|
||||||
'libgdk-3.so.0': 'libgtk-3-0',
|
'libgdk-3.so.0': 'libgtk-3-0',
|
||||||
'libgio-2.0.so.0': 'libglib2.0-0',
|
'libgio-2.0.so.0': 'libglib2.0-0',
|
||||||
|
|
@ -749,12 +798,10 @@ export const deps: any = {
|
||||||
'libGLX.so.0': 'libglx0',
|
'libGLX.so.0': 'libglx0',
|
||||||
'libgmodule-2.0.so.0': 'libglib2.0-0',
|
'libgmodule-2.0.so.0': 'libglib2.0-0',
|
||||||
'libgobject-2.0.so.0': 'libglib2.0-0',
|
'libgobject-2.0.so.0': 'libglib2.0-0',
|
||||||
'libgpg-error.so.0': 'libgpg-error0',
|
|
||||||
'libgstallocators-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
|
'libgstallocators-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
|
||||||
'libgstapp-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
|
'libgstapp-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
|
||||||
'libgstaudio-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
|
'libgstaudio-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
|
||||||
'libgstbase-1.0.so.0': 'libgstreamer1.0-0',
|
'libgstbase-1.0.so.0': 'libgstreamer1.0-0',
|
||||||
'libgstcodecparsers-1.0.so.0': 'libgstreamer-plugins-bad1.0-0',
|
|
||||||
'libgstfft-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
|
'libgstfft-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
|
||||||
'libgstgl-1.0.so.0': 'libgstreamer-gl1.0-0',
|
'libgstgl-1.0.so.0': 'libgstreamer-gl1.0-0',
|
||||||
'libgstpbutils-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
|
'libgstpbutils-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
|
||||||
|
|
@ -762,13 +809,15 @@ export const deps: any = {
|
||||||
'libgsttag-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
|
'libgsttag-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
|
||||||
'libgstvideo-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
|
'libgstvideo-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
|
||||||
'libgtk-3.so.0': 'libgtk-3-0',
|
'libgtk-3.so.0': 'libgtk-3-0',
|
||||||
|
'libgudev-1.0.so.0': 'libgudev-1.0-0',
|
||||||
'libharfbuzz-icu.so.0': 'libharfbuzz-icu0',
|
'libharfbuzz-icu.so.0': 'libharfbuzz-icu0',
|
||||||
'libharfbuzz.so.0': 'libharfbuzz0b',
|
'libharfbuzz.so.0': 'libharfbuzz0b',
|
||||||
'libhyphen.so.0': 'libhyphen0',
|
'libhyphen.so.0': 'libhyphen0',
|
||||||
|
'libicui18n.so.67': 'libicu67',
|
||||||
|
'libicuuc.so.67': 'libicu67',
|
||||||
'libjavascriptcoregtk-4.0.so.18': 'libjavascriptcoregtk-4.0-18',
|
'libjavascriptcoregtk-4.0.so.18': 'libjavascriptcoregtk-4.0-18',
|
||||||
'libjpeg.so.62': 'libjpeg62-turbo',
|
'libjpeg.so.62': 'libjpeg62-turbo',
|
||||||
'liblcms2.so.2': 'liblcms2-2',
|
'liblcms2.so.2': 'liblcms2-2',
|
||||||
'libm.so.6': 'libc6',
|
|
||||||
'libmanette-0.2.so.0': 'libmanette-0.2-0',
|
'libmanette-0.2.so.0': 'libmanette-0.2-0',
|
||||||
'libnotify.so.4': 'libnotify4',
|
'libnotify.so.4': 'libnotify4',
|
||||||
'libnspr4.so': 'libnspr4',
|
'libnspr4.so': 'libnspr4',
|
||||||
|
|
@ -780,19 +829,15 @@ export const deps: any = {
|
||||||
'libpango-1.0.so.0': 'libpango-1.0-0',
|
'libpango-1.0.so.0': 'libpango-1.0-0',
|
||||||
'libpangocairo-1.0.so.0': 'libpangocairo-1.0-0',
|
'libpangocairo-1.0.so.0': 'libpangocairo-1.0-0',
|
||||||
'libpng16.so.16': 'libpng16-16',
|
'libpng16.so.16': 'libpng16-16',
|
||||||
'libpthread.so.0': 'libc6',
|
'libproxy.so.1': 'libproxy1v5',
|
||||||
'libsecret-1.so.0': 'libsecret-1-0',
|
'libsecret-1.so.0': 'libsecret-1-0',
|
||||||
'libsmime3.so': 'libnss3',
|
'libsmime3.so': 'libnss3',
|
||||||
'libsoup-2.4.so.1': 'libsoup2.4-1',
|
'libsoup-2.4.so.1': 'libsoup2.4-1',
|
||||||
'libsqlite3.so.0': 'libsqlite3-0',
|
|
||||||
'libstdc++.so.6': 'libstdc++6',
|
|
||||||
'libsystemd.so.0': 'libsystemd0',
|
|
||||||
'libtasn1.so.6': 'libtasn1-6',
|
|
||||||
'libvpx.so.6': 'libvpx6',
|
|
||||||
'libwayland-client.so.0': 'libwayland-client0',
|
'libwayland-client.so.0': 'libwayland-client0',
|
||||||
'libwayland-egl.so.1': 'libwayland-egl1',
|
'libwayland-egl.so.1': 'libwayland-egl1',
|
||||||
'libwayland-server.so.0': 'libwayland-server0',
|
'libwayland-server.so.0': 'libwayland-server0',
|
||||||
'libwebkit2gtk-4.0.so.37': 'libwebkit2gtk-4.0-37',
|
'libwebkit2gtk-4.0.so.37': 'libwebkit2gtk-4.0-37',
|
||||||
|
'libwebp.so.6': 'libwebp6',
|
||||||
'libwebpdemux.so.2': 'libwebpdemux2',
|
'libwebpdemux.so.2': 'libwebpdemux2',
|
||||||
'libwoff2dec.so.1.0.2': 'libwoff1',
|
'libwoff2dec.so.1.0.2': 'libwoff1',
|
||||||
'libwpe-1.0.so.1': 'libwpe-1.0-1',
|
'libwpe-1.0.so.1': 'libwpe-1.0-1',
|
||||||
|
|
@ -813,10 +858,8 @@ export const deps: any = {
|
||||||
'libXrandr.so.2': 'libxrandr2',
|
'libXrandr.so.2': 'libxrandr2',
|
||||||
'libXrender.so.1': 'libxrender1',
|
'libXrender.so.1': 'libxrender1',
|
||||||
'libxslt.so.1': 'libxslt1.1',
|
'libxslt.so.1': 'libxslt1.1',
|
||||||
'libXt.so.6': 'libxt6',
|
|
||||||
'libXtst.so.6': 'libxtst6',
|
'libXtst.so.6': 'libxtst6',
|
||||||
'libz.so.1': 'libzadc4',
|
}
|
||||||
},
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue