mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

AppImage: don't bundle our libdbus

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2019-11-21 08:01:26 -08:00
parent f9910caa35
commit 84394adb11
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/scripts/linux-in-container-build.sh vendored
View file

@ -3,7 +3,7 @@
set -x set -x
set -e 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 # inside of the trusty-qt512 container
export PATH=$QT_ROOT/bin:$PATH # Make sure correct qmake is found on the $PATH for linuxdeployqt 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 QTDIR
unset QT_PLUGIN_PATH unset QT_PLUGIN_PATH
unset LD_LIBRARY_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 # create the AppImage
export VERSION=$(cd subsurface/scripts ; ./get-version linux) # linuxdeployqt uses this for naming the file 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 # copy AppImage to the calling VM
# with GitHub Actions the /${GITHUB_WORKSPACE} directory is the current working directory at the start of a step # with GitHub Actions the /${GITHUB_WORKSPACE} directory is the current working directory at the start of a step

1
CHANGELOG.md
View file

@ -3,6 +3,7 @@ Mobile: (desktop only) new switch --testqml, allows to use qml files instead of
Desktop: increase speed of multi-trip selection Desktop: increase speed of multi-trip selection
Mobile: ensure that all BT/BLE flavors of the OSTC are recognized as dive computers [#2358] Mobile: ensure that all BT/BLE flavors of the OSTC are recognized as dive computers [#2358]
mobile-widgets: Add export function 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: allow copy&pasting of multiple cylinders [#2386]
Desktop: don't output random SAC values for cylinders without data [#2376] 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 Mobile: add menu entry to start a support email, using native email client