From 42f1da71326b7551bdf3ce6f6884e57c71dfa5e6 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 4 Jun 2024 12:50:09 +0200 Subject: [PATCH] [client,SDL] add webkit2gtk4.1 support --- client/SDL/common/aad/CMakeLists.txt | 5 ++++- packaging/deb/freerdp-nightly/control | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client/SDL/common/aad/CMakeLists.txt b/client/SDL/common/aad/CMakeLists.txt index 4ddc60f13..e20e5b96b 100644 --- a/client/SDL/common/aad/CMakeLists.txt +++ b/client/SDL/common/aad/CMakeLists.txt @@ -61,7 +61,10 @@ if (WITH_WEBVIEW) ) else() find_package(PkgConfig REQUIRED) - pkg_check_modules(WEBVIEW_GTK webkit2gtk-4.0 REQUIRED) + pkg_check_modules(WEBVIEW_GTK webkit2gtk-4.1) + if (NOT WEBVIEW_GTK_FOUND) + pkg_check_modules(WEBVIEW_GTK webkit2gtk-4.0 REQUIRED) + endif() include_directories(${WEBVIEW_GTK_INCLUDE_DIRS}) list(APPEND LIBS ${WEBVIEW_GTK_LIBRARIES} diff --git a/packaging/deb/freerdp-nightly/control b/packaging/deb/freerdp-nightly/control index 6c2e1c725..ee12834ae 100644 --- a/packaging/deb/freerdp-nightly/control +++ b/packaging/deb/freerdp-nightly/control @@ -50,7 +50,7 @@ Build-Depends: libsdl3-ttf-dev | libsdl2-ttf-dev, libsdl3-image-dev | libsdl2-image-dev, libsystemd-dev, - libwebkit2gtk-4.0-dev, + libwebkit2gtk-4.1-dev | libwebkit2gtk-4.0-dev, liburiparser-dev, libopus-dev, libwebp-dev,