diff options
| -rw-r--r-- | .github/workflows/linux-bionic-5.9.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/linux-eoan-5.12.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/scripts/linux-in-container-build.sh | 4 | ||||
| -rw-r--r-- | packaging/OBS/subsurfacedaily.spec | 2 | ||||
| -rw-r--r-- | packaging/ubuntu/debian/control | 1 |
5 files changed, 9 insertions, 2 deletions
diff --git a/.github/workflows/linux-bionic-5.9.yml b/.github/workflows/linux-bionic-5.9.yml index 85241b3a2..bdfb71600 100644 --- a/.github/workflows/linux-bionic-5.9.yml +++ b/.github/workflows/linux-bionic-5.9.yml @@ -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: | diff --git a/.github/workflows/linux-eoan-5.12.yml b/.github/workflows/linux-eoan-5.12.yml index 50c446f91..68be79ce3 100644 --- a/.github/workflows/linux-eoan-5.12.yml +++ b/.github/workflows/linux-eoan-5.12.yml @@ -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: | diff --git a/.github/workflows/scripts/linux-in-container-build.sh b/.github/workflows/scripts/linux-in-container-build.sh index 11897fbd6..2316a0ced 100644 --- a/.github/workflows/scripts/linux-in-container-build.sh +++ b/.github/workflows/scripts/linux-in-container-build.sh @@ -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/ diff --git a/packaging/OBS/subsurfacedaily.spec b/packaging/OBS/subsurfacedaily.spec index d5d511fef..57da33a6e 100644 --- a/packaging/OBS/subsurfacedaily.spec +++ b/packaging/OBS/subsurfacedaily.spec @@ -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 diff --git a/packaging/ubuntu/debian/control b/packaging/ubuntu/debian/control index 5345bc072..08b51bf3c 100644 --- a/packaging/ubuntu/debian/control +++ b/packaging/ubuntu/debian/control @@ -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, |