Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qt/linux: also bundle Wayland platform libs to support Wayland #3117

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .containerversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
26
27
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- Fix address signing fail on screen rotation for Pocket and Bitsurance
- Restrict selection to text files when importing notes
- Display the hide amount button by default and remove its settings
- Linux: add support for Wayland

# 4.46.3
- Fix camera access on linux
Expand Down
8 changes: 7 additions & 1 deletion frontends/qt/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,13 @@ linux:
mv build/BitBox build/linux-tmp
cp build/assets.rcc build/linux-tmp/
cp server/libserver.so build/linux-tmp
cd build/linux-tmp && /opt/linuxdeployqt-continuous-x86_64.AppImage BitBox -bundle-non-qt-libs -unsupported-allow-new-glibc
cd build/linux-tmp && /opt/linuxdeployqt-continuous-x86_64.AppImage BitBox \
-bundle-non-qt-libs \
-unsupported-allow-new-glibc \
# Add Wayland libs so the app can run natively on Wayland too.
# The linuxdeployqt maintainer unfortunately refuses to support it automatically: https://github.com/probonopd/linuxdeployqt/issues/189
# The list of related plugins was found by: `find $(qmake -query QT_INSTALL_PLUGINS) | grep wayland`
-extra-plugins=platforms/libqwayland-generic.so,platforms/libqwayland-egl.so,wayland-graphics-integration-client,wayland-decoration-client,wayland-shell-integration
cp /usr/lib/x86_64-linux-gnu/nss/* build/linux-tmp/lib
cp -aR resources/linux build/tmp-deb
cp resources/linux/usr/share/applications/bitbox.desktop build/linux-tmp
Expand Down
2 changes: 2 additions & 0 deletions scripts/docker_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ apt-get install -y --no-install-recommends \
libxcb-randr0 \
libxcb-shape0 \
libxcb-xinput0 \
libwayland-cursor0 \
libwayland-egl1 \
libcups2 \
libgl1-mesa-dev \
libegl1-mesa-dev \
Expand Down
Loading