lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update node.js to 12

Browse Source 
For Ubuntu it means using an alternative packages, for
openSUSE not using an alternative package.

Pick-to: 6.2
Change-Id: I09085428db083adc1ff1d68f384cd19c83605bfd
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This commit is contained in:
Allan Sandfeld Jensen
2021-07-22 10:46:59 +02:00
parent 51c0f68cb9
commit c4b8c908b6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
View File

@@ -90,8 +90,7 @@ installPackages+=(libgbm-dev)
installPackages+=(libxkbfile-dev) installPackages+=(libxkbfile-dev)
installPackages+=(libxshmfence-dev) installPackages+=(libxshmfence-dev)
installPackages+=(libxss-dev) installPackages+=(libxss-dev)
installPackages+=(nodejs) installPackages+=(nodejs-mozilla) # use nodejs-mozilla because nodejs is outdated
# NOTE! Can't install nodejs-dev because libssl1.0-dev conflicts with libssl1.0-dev which is depandency of nodejs-dev.
# Common event loop handling # Common event loop handling
installPackages+=(libglib2.0-dev) 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" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"
OpenSSLVersion="$(openssl version |cut -b 9-14)" OpenSSLVersion="$(openssl version |cut -b 9-14)"
echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

2
coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh
View File

@@ -37,7 +37,7 @@ sudo zypper -nq install libicu-devel
# qtwebengine # qtwebengine
sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \ sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \
libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-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 libxshmfence-devel libXdamage-devel
# qtwebkit # qtwebkit