mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-17 09:46:08 +08:00
Update node.js to 12
For Ubuntu it means using an alternative packages, for
openSUSE not using an alternative package.
Change-Id: I09085428db083adc1ff1d68f384cd19c83605bfd
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit c4b8c908b6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
committed by
Qt Cherry-pick Bot
parent
aaf0fad6b5
commit
1f452fd479
@@ -90,8 +90,7 @@ installPackages+=(libgbm-dev)
|
||||
installPackages+=(libxkbfile-dev)
|
||||
installPackages+=(libxshmfence-dev)
|
||||
installPackages+=(libxss-dev)
|
||||
installPackages+=(nodejs)
|
||||
# NOTE! Can't install nodejs-dev because libssl1.0-dev conflicts with libssl1.0-dev which is depandency of nodejs-dev.
|
||||
installPackages+=(nodejs-mozilla) # use nodejs-mozilla because nodejs is outdated
|
||||
|
||||
# Common event loop handling
|
||||
installPackages+=(libglib2.0-dev)
|
||||
@@ -231,6 +230,7 @@ pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/sh
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
|
||||
SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"
|
||||
|
||||
OpenSSLVersion="$(openssl version |cut -b 9-14)"
|
||||
echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
@@ -37,7 +37,7 @@ sudo zypper -nq install libicu-devel
|
||||
# qtwebengine
|
||||
sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \
|
||||
libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
|
||||
mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel glproto-devel \
|
||||
mozilla-nspr-devel mozilla-nss-devel nodejs12 glproto-devel \
|
||||
libxshmfence-devel libXdamage-devel
|
||||
|
||||
# qtwebkit
|
||||
|
||||
Reference in New Issue
Block a user