From 0e7f69ee31bb636f5149ca5c0e5e292b1ff4b6c2 Mon Sep 17 00:00:00 2001 From: Matt Gajownik Date: Tue, 23 Aug 2022 19:47:41 +1000 Subject: [PATCH] CI: Bump Linux CEF build to disable GTK Fixes #7146 Normally, Qt and CEF each run their own version of GTK, often causing conflicts. This commit introduces a build of CEF where GTK has been disabled using `use_gtk=false` as we do not require the Chrome runtime. This is an experiment and may end up being the safest long-term solution. Note: This does introduce potential quirks/incompatibilities, such as browser sources no longer being able to display alert() dialogs, and potentially file browser dialogs not working from CEF. This is better than the alternative. If necessary, such dialogs can be reimplemented using Qt at a later date, and would likely provide a more consistent user experience. --- .github/workflows/main.yml | 2 +- CI/flatpak/com.obsproject.Studio.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5dbb6f189..f5343ffa2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ on: branches: [master] env: - CACHE_REVISION: '005' + CACHE_REVISION: '006' CEF_BUILD_VERSION_MAC: '5060' CEF_HASH_MAC_X86_64: '88b950aa0bfc001061c35e7f1f3fefba856a6afb35e38b2b7b42ddd8dd239182' CEF_HASH_MAC_ARM64: '98679b92eea6ea9959ac5aa54f46ca60681d8a86c768c35f496dbdd409bf0642' diff --git a/CI/flatpak/com.obsproject.Studio.json b/CI/flatpak/com.obsproject.Studio.json index 23930108c..1259ed417 100644 --- a/CI/flatpak/com.obsproject.Studio.json +++ b/CI/flatpak/com.obsproject.Studio.json @@ -407,7 +407,7 @@ { "type": "archive", "url": "https://cdn-fastly.obsproject.com/downloads/cef_binary_5060_linux64.tar.bz2", - "sha256": "1fe9c09bb43e8d2be2c07b792e69fb51250782e68f2c8d1d30da2559cfb9ae0e" + "sha256": "ac4e2a8ebf20700e4e36353e314f876623633dd5b474778a2548bb66bdbea11d" } ] },