From a5984d82131ce1c658487fdd0b87dcf7a766351f Mon Sep 17 00:00:00 2001 From: JordanTheToaster Date: Sat, 25 Oct 2025 15:29:30 +0100 Subject: [PATCH] Flatpak: Update KDE runtime to 6.10 --- .github/workflows/linux_build_flatpak.yml | 2 +- .../scripts/linux/flatpak/net.pcsx2.PCSX2.json | 10 +++++----- cmake/SearchForStuff.cmake | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux_build_flatpak.yml b/.github/workflows/linux_build_flatpak.yml index f4907c21de..1f1a77ecc4 100644 --- a/.github/workflows/linux_build_flatpak.yml +++ b/.github/workflows/linux_build_flatpak.yml @@ -45,7 +45,7 @@ jobs: name: ${{ inputs.jobName }} runs-on: ${{ inputs.os }} container: - image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.7 + image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.9 options: --privileged timeout-minutes: 60 diff --git a/.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json b/.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json index e0d8556a59..5f52d07276 100644 --- a/.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json +++ b/.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json @@ -1,15 +1,15 @@ { "app-id": "net.pcsx2.PCSX2", "runtime": "org.kde.Platform", - "runtime-version": "6.9", + "runtime-version": "6.10", "sdk": "org.kde.Sdk", "sdk-extensions": [ - "org.freedesktop.Sdk.Extension.llvm18" + "org.freedesktop.Sdk.Extension.llvm20" ], "add-extensions": { "org.freedesktop.Platform.ffmpeg-full": { "directory": "lib/ffmpeg", - "version": "24.08", + "version": "25.08", "add-ld-path": ".", "autodownload": true } @@ -50,8 +50,8 @@ "-DCMAKE_PREFIX_PATH=\"${FLATPAK_DEST}\"", "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON", - "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm18/bin/clang", - "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm18/bin/clang++", + "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm20/bin/clang", + "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm20/bin/clang++", "-DCMAKE_EXE_LINKER_FLAGS_INIT=-fuse-ld=lld", "-DCMAKE_MODULE_LINKER_FLAGS_INIT=-fuse-ld=lld", "-DCMAKE_SHARED_LINKER_FLAGS_INIT=-fuse-ld=lld", diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index 686cd22cff..29568298b8 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -108,7 +108,7 @@ disable_compiler_warnings_for_target(speex) # Find the Qt components that we need. if(ENABLE_QT_UI) - find_package(Qt6 6.7.3 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED) + find_package(Qt6 6.10.0 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED) endif() if (Qt6_VERSION VERSION_GREATER_EQUAL 6.10.0)