Skip to content

Commit ef9ec6f

Browse files
tytan652RytoEX
authored andcommitted
build-aux,CI: Replace Flatpak KDE SDK with Freedesktop SDK
The Qt components are from the same repo as other dependencies. The KDE Platform was never a good fit for OBS Studio for multiple reasons: - Life cycle too short and misaligned with OBS Studio causing users to get EOL notification too often. - Third-party Qt plugins were allowed which could change Qt's behavior. - KDE exclusives sandboxed holes were inherited.
1 parent 081b684 commit ef9ec6f

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

.github/workflows/build-project.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ jobs:
249249
env:
250250
FLATPAK_BUILD_SHARE_PATH: flatpak_app/files/share
251251
container:
252-
image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8
252+
image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-24.08
253253
options: --privileged
254254
volumes:
255255
- /usr/local/lib/android:/to_clean/android

.github/workflows/publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
YOUTUBE_SECRET: ${{ secrets.YOUTUBE_SECRET }}
8888
YOUTUBE_SECRET_HASH: ${{ secrets.YOUTUBE_SECRET_HASH }}
8989
container:
90-
image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8
90+
image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-24.08
9191
options: --privileged
9292
volumes:
9393
- /usr/local/lib/android:/to_clean/android

build-aux/com.obsproject.Studio.json

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"id": "com.obsproject.Studio",
3-
"runtime": "org.kde.Platform",
4-
"runtime-version": "6.8",
5-
"sdk": "org.kde.Sdk",
3+
"runtime": "org.freedesktop.Platform",
4+
"runtime-version": "24.08",
5+
"sdk": "org.freedesktop.Sdk",
66
"command": "obs",
77
"finish-args": [
88
"--socket=wayland",
@@ -86,6 +86,21 @@
8686
}
8787
]
8888
},
89+
{
90+
"name": "qt",
91+
"buildsystem": "simple",
92+
"build-commands": [
93+
"tar -xvf qt.tar.xz -C /"
94+
],
95+
"sources": [
96+
{
97+
"type": "file",
98+
"dest-filename": "qt.tar.xz",
99+
"url": "https://github.com/obsproject/obs-deps-buildstream/releases/download/2025-10-03/flatpak-qt-x86_64-2025-10-03.tar.xz",
100+
"sha256": "79d7377da42e1eea2a18ed76407c1db716a80778fe34ef1f68b9eb7ca6d89cbf"
101+
}
102+
]
103+
},
89104
{
90105
"name": "cef",
91106
"build-options": {

0 commit comments

Comments
 (0)