Remove debian_buildenv.sh for Qt5

daschuer · Jun 20, 2023 · 0269025 · 0269025
1 parent 12a5a46
commit 0269025
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 112 deletions.
diff --git a/.github/workflows/build-checks.yml b/.github/workflows/build-checks.yml
@@ -37,6 +37,7 @@ jobs:
           cmake \
             -DCMAKE_BUILD_TYPE=Debug \
             -DWARNINGS_FATAL=ON \
+            -DQT6=ON \
             -DOPTIMIZE=off \
             -DBATTERY=ON \
             -DBROADCAST=ON \
@@ -65,6 +66,7 @@ jobs:
             -DCMAKE_BUILD_TYPE=Debug \
             -DCLANG_TIDY=clang-tidy \
             -DWARNINGS_FATAL=ON \
+            -DQT6=ON \
             -DBATTERY=ON \
             -DBROADCAST=ON \
             -DBULK=ON \
@@ -91,6 +93,7 @@ jobs:
           cmake \
             -DCMAKE_BUILD_TYPE=Debug \
             -DOPTIMIZE=off \
+            -DQT6=ON \
             -DCOVERAGE=ON \
             -DWARNINGS_FATAL=OFF \
             -DDEBUG_ASSERTIONS_FATAL=OFF \

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
             compiler_cache: ccache
             compiler_cache_path: ~/.ccache
             cpack_generator: DEB
-            buildenv_basepath: /home/runner/buildenv_qt6.sh
+            buildenv_basepath: /home/runner/buildenv.sh
             buildenv_script: tools/debian_buildenv.sh
             artifacts_name: Ubuntu 22.04 DEB
             artifacts_path: build/*.deb
@@ -55,7 +55,7 @@ jobs:
             compiler_cache_path: ~/.ccache
             cpack_generator: DEB
             buildenv_basepath: /home/runner/buildenv
-            buildenv_script: tools/debian_buildenv_qt6.sh
+            buildenv_script: tools/debian_buildenv.sh
             artifacts_name: Ubuntu 22.04 Qt6 DEB
             artifacts_path: build/*.deb
             artifacts_slug: ubuntu-jammy

diff --git a/tools/debian_buildenv.sh b/tools/debian_buildenv.sh
@@ -54,6 +54,7 @@ case "$1" in
             libfaad-dev \
             libfftw3-dev \
             libflac-dev \
+            libgl1-mesa-dev \
             libhidapi-dev \
             libid3tag0-dev \
             liblilv-dev \
@@ -65,10 +66,10 @@ case "$1" in
             libopusfile-dev \
             libportmidi-dev \
             libprotobuf-dev \
-            libqt5opengl5-dev \
-            libqt5sql5-sqlite \
-            libqt5svg5-dev \
-            libqt5x11extras5-dev \
+            libqt6core5compat6-dev\
+            libqt6opengl6-dev \
+            libqt6sql6-sqlite \
+            libqt6svg6-dev \
             librubberband-dev \
             libshout-idjc-dev \
             libsndfile1-dev \
@@ -84,8 +85,8 @@ case "$1" in
             markdown \
             portaudio19-dev \
             protobuf-compiler \
-            qt5keychain-dev \
-            qtdeclarative5-dev \
+            qtkeychain-qt6-dev \
+            qt6-declarative-dev \
             qml-module-qtquick-controls \
             qml-module-qtquick-controls2 \
             qml-module-qt-labs-qmlmodels \

diff --git a/tools/debian_buildenv_qt6.sh b/tools/debian_buildenv_qt6.sh