From d58d84dbcfa8768496959d7a29de6598873a4066 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Wed, 25 Oct 2023 13:55:50 +1000
Subject: [PATCH] CI/Flatpak: Bump to KDE 6.6 runtime

---
 .../workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json  | 8 ++++----
 .../workflows/scripts/linux/install-packages-flatpak.sh   | 6 +++---
 cmake/SearchForStuff.cmake                                | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json b/.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
index 4b11b25898..6aa1ef9b08 100644
--- a/.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
+++ b/.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
@@ -1,10 +1,10 @@
 {
   "app-id": "net.pcsx2.PCSX2",
   "runtime": "org.kde.Platform",
-  "runtime-version": "6.5",
+  "runtime-version": "6.6",
   "sdk": "org.kde.Sdk",
   "sdk-extensions": [
-    "org.freedesktop.Sdk.Extension.llvm16"
+    "org.freedesktop.Sdk.Extension.llvm17"
   ],
   "add-extensions": {
     "org.freedesktop.Platform.ffmpeg-full": {
@@ -39,8 +39,8 @@
         "env": {
           "DEPS_PREFIX": "/app",
           "COMPILER": "clang",
-          "CLANG_PATH": "/usr/lib/sdk/llvm16/bin/clang",
-          "CLANGXX_PATH": "/usr/lib/sdk/llvm16/bin/clang++",
+          "CLANG_PATH": "/usr/lib/sdk/llvm17/bin/clang",
+          "CLANGXX_PATH": "/usr/lib/sdk/llvm17/bin/clang++",
           "ADDITIONAL_CMAKE_ARGS": "-DUSE_LINKED_FFMPEG=ON"
         }
       },
diff --git a/.github/workflows/scripts/linux/install-packages-flatpak.sh b/.github/workflows/scripts/linux/install-packages-flatpak.sh
index 786766b194..2d68ddff39 100755
--- a/.github/workflows/scripts/linux/install-packages-flatpak.sh
+++ b/.github/workflows/scripts/linux/install-packages-flatpak.sh
@@ -6,8 +6,8 @@ source "$SCRIPTDIR/functions.sh"
 set -e
 
 ARCH=x86_64
-KDE_BRANCH=6.5
-BRANCH=22.08
+KDE_BRANCH=6.6
+BRANCH=23.08
 FLAT_MANAGER_CLIENT_DIR="$HOME/.local/bin"
 
 # Build packages. Mostly needed for flat-manager-client.
@@ -30,7 +30,7 @@ declare -a FLATPAK_PACKAGES=(
   "org.kde.Platform/${ARCH}/${KDE_BRANCH}"
   "org.kde.Sdk/${ARCH}/${KDE_BRANCH}"
   "org.freedesktop.Platform.ffmpeg-full/${ARCH}/${BRANCH}"
-  "org.freedesktop.Sdk.Extension.llvm16/${ARCH}/${BRANCH}"
+  "org.freedesktop.Sdk.Extension.llvm17/${ARCH}/${BRANCH}"
   "org.freedesktop.appstream-glib/${ARCH}/stable"
 )
 
diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
index 9ea7af6bb7..df3c44e34d 100644
--- a/cmake/SearchForStuff.cmake
+++ b/cmake/SearchForStuff.cmake
@@ -156,7 +156,7 @@ disable_compiler_warnings_for_target(cubeb)
 disable_compiler_warnings_for_target(speex)
 
 # Find the Qt components that we need.
-find_package(Qt6 6.5.3 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets Network LinguistTools REQUIRED)
+find_package(Qt6 6.6.0 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets Network LinguistTools REQUIRED)
 
 if(WIN32)
   add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL)