diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-11-21 08:01:26 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-12-07 10:21:05 -0800 |
| commit | 84394adb11736de0fa37f7dfb7cf426fcd8f26f5 (patch) | |
| tree | ffccb755eb82ba8da2a79ad8a0b84f28ddb16534 | |
| parent | f9910caa353797dff45379a0cf23ea9934bad213 (diff) | |
| download | subsurface-84394adb11736de0fa37f7dfb7cf426fcd8f26f5.tar.gz | |
AppImage: don't bundle our libdbus
This appears to prevent Bluetooth from working.
Fixes: #2370
Suggested-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | .github/workflows/scripts/linux-in-container-build.sh | 6 | ||||
| -rw-r--r-- | CHANGELOG.md | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/scripts/linux-in-container-build.sh b/.github/workflows/scripts/linux-in-container-build.sh index 8a2b31b59..11897fbd6 100644 --- a/.github/workflows/scripts/linux-in-container-build.sh +++ b/.github/workflows/scripts/linux-in-container-build.sh @@ -3,7 +3,7 @@ set -x set -e -# this gets executed by Travis when building an AppImage for Linux +# this gets executed by the GitHub Action when building an AppImage for Linux # inside of the trusty-qt512 container export PATH=$QT_ROOT/bin:$PATH # Make sure correct qmake is found on the $PATH for linuxdeployqt @@ -50,11 +50,11 @@ chmod a+x linuxdeployqt*.AppImage unset QTDIR unset QT_PLUGIN_PATH unset LD_LIBRARY_PATH -./linuxdeployqt*.AppImage --appimage-extract-and-run ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs -qmldir=./subsurface/map-widget/ -verbose=2 +./linuxdeployqt*.AppImage --appimage-extract-and-run ./appdir/usr/share/applications/*.desktop -exclude-libs=libdbus-1.so.3 -bundle-non-qt-libs -qmldir=./subsurface/map-widget/ -verbose=2 # create the AppImage export VERSION=$(cd subsurface/scripts ; ./get-version linux) # linuxdeployqt uses this for naming the file -./linuxdeployqt*.AppImage --appimage-extract-and-run ./appdir/usr/share/applications/*.desktop -appimage -qmldir=./subsurface/map-widget/ -verbose=2 +./linuxdeployqt*.AppImage --appimage-extract-and-run ./appdir/usr/share/applications/*.desktop -exclude-libs=libdbus-1.so.3 -appimage -qmldir=./subsurface/map-widget/ -verbose=2 # copy AppImage to the calling VM # with GitHub Actions the /${GITHUB_WORKSPACE} directory is the current working directory at the start of a step diff --git a/CHANGELOG.md b/CHANGELOG.md index 24818f223..79d20b8ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ Mobile: (desktop only) new switch --testqml, allows to use qml files instead of Desktop: increase speed of multi-trip selection Mobile: ensure that all BT/BLE flavors of the OSTC are recognized as dive computers [#2358] mobile-widgets: Add export function +Desktop/Linux: fix issue with Linux AppImage failing to communicate with Bluetooth dive computers [#2370] Desktop: allow copy&pasting of multiple cylinders [#2386] Desktop: don't output random SAC values for cylinders without data [#2376] Mobile: add menu entry to start a support email, using native email client |