status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-16 08:37:12 +00:00
Code Issues Projects Releases Wiki Activity

chore(nix)_: fix qtwebengine issues

Browse Source
This commit is contained in:
Anton Iakimov 2024-10-10 12:19:17 +02:00
parent f0e8443f28
commit 9767a9809c
No known key found for this signature in database
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
AppRun
View File

@ -2,14 +2,15 @@
APPDIR="$(dirname "$(readlink -f "${0}")")" APPDIR="$(dirname "$(readlink -f "${0}")")"
export GST_PLUGIN_SCANNER="${APPDIR}/usr/lib/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner" export GST_PLUGIN_SCANNER="${APPDIR}/usr/lib/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner"
export GST_PLUGIN_PATH="${APPDIR}/usr/lib/gstreamer-1.0" export GST_PLUGIN_PATH="${APPDIR}/usr/lib/gstreamer-1.0"
export GST_PLUGIN_PATH_1_0="${APPDIR}/usr/lib/gstreamer-1.0" export GST_PLUGIN_PATH_1_0="${GST_PLUGIN_PATH}"
export GST_PLUGIN_SYSTEM_PATH="${APPDIR}/usr/lib/gstreamer-1.0" export GST_PLUGIN_SYSTEM_PATH="${GST_PLUGIN_PATH}"
export GST_PLUGIN_SYSTEM_PATH_1_0="${APPDIR}/usr/lib/gstreamer-1.0" export GST_PLUGIN_SYSTEM_PATH_1_0="${GST_PLUGIN_PATH}"
export LD_LIBRARY_PATH="${APPDIR}/usr/lib/:${APPDIR}/usr/lib/nss:${LD_LIBRARY_PATH}" export LD_LIBRARY_PATH="${APPDIR}/usr/lib/:${APPDIR}/usr/lib/nss:${LD_LIBRARY_PATH}"
export QT_QPA_PLATFORM="xcb" export QT_QPA_PLATFORM="xcb"
# TODO: Remove once qt 5.15.2 support is dropped # TODO: Remove once qt 5.15.2 support is dropped
# Fixing bug: https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1944468 # Fixing bug: https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1944468
export QTWEBENGINE_CHROMIUM_FLAGS="${QTWEBENGINE_CHROMIUM_FLAGS} --disable-seccomp-filter-sandbox" export QTWEBENGINE_CHROMIUM_FLAGS="${QTWEBENGINE_CHROMIUM_FLAGS} --disable-seccomp-filter-sandbox"
export QTWEBENGINEPROCESS_PATH="${APPDIR}/usr/bin/QtWebEngineProcess"
DEFAULT_LANG=en_US.UTF-8 DEFAULT_LANG=en_US.UTF-8
if [[ "$LANG" == "C.UTF-8" ]] if [[ "$LANG" == "C.UTF-8" ]]

12
AppRun-cpp
View File

@ -2,11 +2,15 @@
APPDIR="$(dirname "$(readlink -f "${0}")")" APPDIR="$(dirname "$(readlink -f "${0}")")"
export GST_PLUGIN_SCANNER="${APPDIR}/usr/lib/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner" export GST_PLUGIN_SCANNER="${APPDIR}/usr/lib/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner"
export GST_PLUGIN_PATH="${APPDIR}/usr/lib/gstreamer-1.0" export GST_PLUGIN_PATH="${APPDIR}/usr/lib/gstreamer-1.0"
export GST_PLUGIN_PATH_1_0="${APPDIR}/usr/lib/gstreamer-1.0" export GST_PLUGIN_PATH_1_0="${GST_PLUGIN_PATH}"
export GST_PLUGIN_SYSTEM_PATH="${APPDIR}/usr/lib/gstreamer-1.0" export GST_PLUGIN_SYSTEM_PATH="${GST_PLUGIN_PATH}"
export GST_PLUGIN_SYSTEM_PATH_1_0="${APPDIR}/usr/lib/gstreamer-1.0" export GST_PLUGIN_SYSTEM_PATH_1_0="${GST_PLUGIN_PATH}"
export LD_LIBRARY_PATH="${APPDIR}/usr/lib/:${LD_LIBRARY_PATH}" export LD_LIBRARY_PATH="${APPDIR}/usr/lib/:${APPDIR}/usr/lib/nss:${LD_LIBRARY_PATH}"
export QT_QPA_PLATFORM="xcb" export QT_QPA_PLATFORM="xcb"
# TODO: Remove once qt 5.15.2 support is dropped
# Fixing bug: https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1944468
export QTWEBENGINE_CHROMIUM_FLAGS="${QTWEBENGINE_CHROMIUM_FLAGS} --disable-seccomp-filter-sandbox"
export QTWEBENGINEPROCESS_PATH="${APPDIR}/usr/bin/QtWebEngineProcess"
DEFAULT_LANG=en_US.UTF-8 DEFAULT_LANG=en_US.UTF-8
if [[ "$LANG" == "C.UTF-8" ]] if [[ "$LANG" == "C.UTF-8" ]]

4
scripts/fix_app_dir.sh
View File

@ -18,11 +18,11 @@ if [[ ! -z "${IN_NIX_SHELL}" ]]; then
patchelf --set-rpath '$ORIGIN/../../' "${APP_DIR}"/usr/lib/gstreamer1.0/gstreamer-1.0/* patchelf --set-rpath '$ORIGIN/../../' "${APP_DIR}"/usr/lib/gstreamer1.0/gstreamer-1.0/*
patchelf --set-rpath '$ORIGIN/../lib' "${APP_DIR}/usr/libexec/QtWebEngineProcess" patchelf --set-rpath '$ORIGIN/../lib' "${APP_DIR}/usr/bin/QtWebEngineProcess"
patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 \ patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 \
"${APP_DIR}/usr/bin/nim_status_client" \ "${APP_DIR}/usr/bin/nim_status_client" \
"${APP_DIR}/usr/libexec/QtWebEngineProcess" \ "${APP_DIR}/usr/bin/QtWebEngineProcess" \
"${APP_DIR}/usr/lib/libQt5Core.so.5" \ "${APP_DIR}/usr/lib/libQt5Core.so.5" \
"${APP_DIR}"/usr/lib/gstreamer1.0/gstreamer-1.0/* "${APP_DIR}"/usr/lib/gstreamer1.0/gstreamer-1.0/*
fi fi

7
scripts/init_app_dir.sh
View File

@ -33,15 +33,14 @@ if [[ -z "${IN_NIX_SHELL}" ]]; then
cp -r /usr/lib/x86_64-linux-gnu/gstreamer1.0 "${APP_DIR}/usr/lib/" cp -r /usr/lib/x86_64-linux-gnu/gstreamer1.0 "${APP_DIR}/usr/lib/"
else else
mkdir -p "${APP_DIR}"/usr/lib/{gstreamer1.0,gstreamer-1.0,nss} mkdir -p "${APP_DIR}"/usr/lib/{gstreamer1.0,gstreamer-1.0,nss}
mkdir -p "${APP_DIR}"/usr/libexec
echo "${GST_PLUGIN_SYSTEM_PATH_1_0}" | tr ':' '\n' | sort -u | xargs -I {} find {} -name "*.so" | xargs -I {} cp {} "${APP_DIR}/usr/lib/gstreamer-1.0/" echo "${GST_PLUGIN_SYSTEM_PATH_1_0}" | tr ':' '\n' | sort -u | xargs -I {} find {} -name "*.so" | xargs -I {} cp {} "${APP_DIR}/usr/lib/gstreamer-1.0/"
cp -r "${GSTREAMER_PATH}/libexec/gstreamer-1.0" "${APP_DIR}/usr/lib/gstreamer1.0/" cp -r "${GSTREAMER_PATH}/libexec/gstreamer-1.0" "${APP_DIR}/usr/lib/gstreamer1.0/"
cp "${LIBKRB5_PATH}/lib/libcom_err.so.3" "${APP_DIR}/usr/lib/libcom_err.so.3" cp "${LIBKRB5_PATH}/lib/libcom_err.so.3" "${APP_DIR}/usr/lib/libcom_err.so.3"
cp "${NSS_PATH}"/lib/{libfreebl3,libfreeblpriv3,libnssckbi,libnssdbm3,libsoftokn3}.{chk,so} "${APP_DIR}/usr/lib/nss/" || true cp "${NSS_PATH}"/lib/{libfreebl3,libfreeblpriv3,libnssckbi,libnssdbm3,libsoftokn3}.{chk,so} "${APP_DIR}/usr/lib/nss/" || true
cp "${QTWEBENGINE_PATH}/libexec/QtWebEngineProcess" "${APP_DIR}/usr/libexec/QtWebEngineProcess" cp "${QTWEBENGINE_PATH}/libexec/QtWebEngineProcess" "${APP_DIR}/usr/bin/QtWebEngineProcess"
cp "${QTWEBENGINE_PATH}"/resources/* "${APP_DIR}/usr/libexec/" cp "${QTWEBENGINE_PATH}"/resources/* "${APP_DIR}/usr/bin/"
cp -r "${QTWEBENGINE_PATH}/translations/qtwebengine_locales" "${APP_DIR}/usr/libexec/" cp -r "${QTWEBENGINE_PATH}/translations/qtwebengine_locales" "${APP_DIR}/usr/bin/"
chmod -R u+w "${APP_DIR}/usr" chmod -R u+w "${APP_DIR}/usr"
fi fi