From 18439a50c3140e3971695578f65481b1a76f4c1c Mon Sep 17 00:00:00 2001
From: Carles Pastor Badosa <cpbadosa@gmail.com>
Date: Sat, 9 Nov 2024 02:11:19 +0100
Subject: [PATCH] Upgrade to 6.8 runtime again now that libfmt issue is fixed
 (#303)

---
 SDL2/SDL2-no-libdecor.json     | 22 ----------------------
 org.DolphinEmu.dolphin-emu.yml |  5 +----
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 SDL2/SDL2-no-libdecor.json

diff --git a/SDL2/SDL2-no-libdecor.json b/SDL2/SDL2-no-libdecor.json
deleted file mode 100644
index 672ac0f..0000000
--- a/SDL2/SDL2-no-libdecor.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "name": "SDL2",
-  "buildsystem": "autotools",
-  "config-opts": ["--disable-static"],
-  "sources": [
-    {
-      "type": "archive",
-      "url": "https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-2.30.6.tar.gz",
-      "sha256": "c6ef64ca18a19d13df6eb22df9aff19fb0db65610a74cc81dae33a82235cacd4"
-    }
-  ],
-  "cleanup": [ "/bin/sdl2-config",
-               "/include",
-               "/lib/libSDL2.la",
-               "/lib/libSDL2main.a",
-               "/lib/libSDL2main.la",
-               "/lib/libSDL2_test.a",
-               "/lib/libSDL2_test.la",
-               "/lib/cmake",
-               "/share/aclocal",
-               "/lib/pkgconfig"]
-}
diff --git a/org.DolphinEmu.dolphin-emu.yml b/org.DolphinEmu.dolphin-emu.yml
index 6d37be4..dcc3644 100644
--- a/org.DolphinEmu.dolphin-emu.yml
+++ b/org.DolphinEmu.dolphin-emu.yml
@@ -1,6 +1,6 @@
 app-id: org.DolphinEmu.dolphin-emu
 runtime: org.kde.Platform
-runtime-version: '6.7'
+runtime-version: '6.8'
 sdk: org.kde.Sdk
 command: dolphin-emu-wrapper
 rename-desktop-file: dolphin-emu.desktop
@@ -65,9 +65,6 @@ modules:
         url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz
         sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399
 
-  # The kde runtime bundles 2.28.5 but current dolphin versions require 2.30.6
-  - SDL2/SDL2-no-libdecor.json
-
   - name: dolphin-emu
     buildsystem: cmake-ninja
     config-opts: