mirror of
https://github.com/subsurface/subsurface.git
synced 2025-01-19 14:25:27 +00:00
build-system/packaging: add bluez dependency for Linux builds
I hope this captures all the variations Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
780cb4fce7
commit
d73e0a0fb4
5 changed files with 9 additions and 2 deletions
2
.github/workflows/linux-bionic-5.9.yml
vendored
2
.github/workflows/linux-bionic-5.9.yml
vendored
|
@ -29,7 +29,7 @@ jobs:
|
|||
qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
|
||||
qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
|
||||
qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
|
||||
qtquickcontrols2-5-dev xvfb
|
||||
qtquickcontrols2-5-dev xvfb libbluetooth-dev
|
||||
|
||||
- name: build Subsurface
|
||||
run: |
|
||||
|
|
2
.github/workflows/linux-eoan-5.12.yml
vendored
2
.github/workflows/linux-eoan-5.12.yml
vendored
|
@ -33,7 +33,7 @@ jobs:
|
|||
qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
|
||||
qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
|
||||
qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
|
||||
qtquickcontrols2-5-dev xvfb
|
||||
qtquickcontrols2-5-dev xvfb libbluetooth-dev
|
||||
|
||||
- name: build Subsurface-mobile
|
||||
run: |
|
||||
|
|
|
@ -10,6 +10,10 @@ export PATH=$QT_ROOT/bin:$PATH # Make sure correct qmake is found on the $PATH f
|
|||
export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake
|
||||
export Grantlee5_ROOT=/__w/subsurface/subsurface/install-root
|
||||
|
||||
echo "--------------------------------------------------------------"
|
||||
echo "install missing packages"
|
||||
apt install -y libbluetooth-dev
|
||||
|
||||
# the container currently has things under / that need to be under /__w/subsurface/subsurface instead
|
||||
cp -a /appdir /__w/subsurface/
|
||||
cp -a /install-root /__w/subsurface/
|
||||
|
|
|
@ -43,6 +43,7 @@ BuildRequires: netpbm-devel
|
|||
BuildRequires: openssl-devel
|
||||
BuildRequires: libsqlite3x-devel
|
||||
BuildRequires: libusbx-devel
|
||||
BuildRequires: bluez-libs-devel
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
BuildRequires: qt5-qttools-devel
|
||||
BuildRequires: qt5-qtwebkit-devel
|
||||
|
@ -62,6 +63,7 @@ BuildRequires: update-desktop-files
|
|||
BuildRequires: libopenssl-devel
|
||||
BuildRequires: sqlite3-devel
|
||||
BuildRequires: libusb-1_0-devel
|
||||
BuildRequires: bluez-devel
|
||||
BuildRequires: libqt5-qtbase-devel
|
||||
BuildRequires: libqt5-qtsvg-devel
|
||||
BuildRequires: libqt5-linguist
|
||||
|
|
|
@ -18,6 +18,7 @@ Build-Depends: asciidoc,
|
|||
cmake,
|
||||
dpkg-dev (>= 1.16.1.1),
|
||||
libusb-1.0-0-dev,
|
||||
libbluetooth-dev,
|
||||
dh-autoreconf,
|
||||
libz-dev,
|
||||
libssl-dev,
|
||||
|
|
Loading…
Add table
Reference in a new issue