From b80fdacb0622159d48fc90b1b1dea465e534c4d5 Mon Sep 17 00:00:00 2001
From: Gary Wang <git@blumia.net>
Date: Mon, 9 Sep 2024 12:52:26 +0800
Subject: [PATCH] fix: require Qt 6.5, FTBFS on ubuntu 24.04 CI

---
 .github/workflows/linux.yml | 14 ++++++++++----
 widget/CMakeLists.txt       |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index d47436d..4954646 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -4,6 +4,9 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
+    strategy:
+      matrix:
+        qt_ver: ['6.7.2']
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout
@@ -13,11 +16,16 @@ jobs:
       - name: Install build dept.
         run: |
           sudo apt update
-          sudo apt install cmake qt6-base-dev qt6-tools-dev qt6-declarative-dev portaudio19-dev libopenmpt-dev
+          sudo apt install cmake portaudio19-dev libopenmpt-dev
           # for linuxdeploy: https://github.com/AppImage/AppImageKit/wiki/FUSE
           # linuxdeploy-plugin-qt still requires qmake currently: https://github.com/linuxdeploy/linuxdeploy-plugin-qt/issues/156
           sudo add-apt-repository universe
-          sudo apt install libfuse2 qmake6
+          sudo apt install libfuse2
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: ${{ matrix.qt_ver }}
+          modules: 'qtmultimedia'
       - name: Get linuxdeploy
         run: |
           wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
@@ -29,8 +37,6 @@ jobs:
           cmake -B build .
           cmake --build build -j
       - name: Package
-        env:
-          QMAKE: /usr/bin/qmake6
         run: |
           ./linuxdeploy-x86_64.AppImage --appdir AppDir -e build/widget/pineapple-tracker-player -d dist/net.blumia.pineapple-tracker-player.desktop -i dist/pineapple-tracker-player.svg --icon-filename net.blumia.pineapple-tracker-player -p qt -o appimage
           rm ./linuxdeploy*x86_64.AppImage
diff --git a/widget/CMakeLists.txt b/widget/CMakeLists.txt
index c33552b..45f7325 100644
--- a/widget/CMakeLists.txt
+++ b/widget/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(Qt6 REQUIRED COMPONENTS Widgets)
+find_package(Qt6 6.5.0 REQUIRED COMPONENTS Widgets)
 find_package(ECM 5.83.0 NO_MODULE)
 
 if(ECM_FOUND)