diff options
Diffstat (limited to 'net/freerdp3/files')
| -rw-r--r-- | net/freerdp3/files/patch-webview-src_cmake_webview.cmake | 47 | ||||
| -rw-r--r-- | net/freerdp3/files/patch-winpr_winpr.pc.in | 10 |
2 files changed, 47 insertions, 10 deletions
diff --git a/net/freerdp3/files/patch-webview-src_cmake_webview.cmake b/net/freerdp3/files/patch-webview-src_cmake_webview.cmake new file mode 100644 index 000000000000..e8d30589704f --- /dev/null +++ b/net/freerdp3/files/patch-webview-src_cmake_webview.cmake @@ -0,0 +1,47 @@ +--- ../.build/_deps/webview-src/cmake/webview.cmake.orig 2025-06-03 18:40:31 UTC ++++ ../.build/_deps/webview-src/cmake/webview.cmake +@@ -8,11 +8,23 @@ macro(webview_find_dependencies) + macro(webview_find_dependencies) + if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + list(APPEND WEBVIEW_DEPENDENCIES "-framework WebKit" dl) +- elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") ++ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") ++ if(WEBVIEW_USE_BUILTIN_MSWEBVIEW2) ++ find_package(MSWebView2 QUIET) ++ if(NOT MSWebView2_FOUND) ++ webview_fetch_mswebview2(${WEBVIEW_MSWEBVIEW2_VERSION}) ++ endif() ++ find_package(MSWebView2 REQUIRED) ++ if(MSWebView2_FOUND) ++ list(APPEND WEBVIEW_DEPENDENCIES MSWebView2::headers) ++ endif() ++ endif() ++ list(APPEND WEBVIEW_DEPENDENCIES advapi32 ole32 shell32 shlwapi user32 version) ++ else() + find_package(PkgConfig REQUIRED) + + # List of preferred WebkitGTK modules (from most to least preferred) +- set(WEBVIEW_WEBKITGTK_PREFERRED_API_LIST webkit2gtk-4.1) ++ set(WEBVIEW_WEBKITGTK_PREFERRED_API_LIST webkitgtk-6.0) + # List of known WebkitGTK modules (from higher to lower version) + set(WEBVIEW_WEBKITGTK_KNOWN_API_LIST webkitgtk-6.0 webkit2gtk-4.1 webkit2gtk-4.0) + +@@ -58,18 +70,6 @@ macro(webview_find_dependencies) + endif() + + list(APPEND WEBVIEW_DEPENDENCIES PkgConfig::WEBVIEW_WEBKITGTK PkgConfig::WEBVIEW_GTK dl) +- elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") +- if(WEBVIEW_USE_BUILTIN_MSWEBVIEW2) +- find_package(MSWebView2 QUIET) +- if(NOT MSWebView2_FOUND) +- webview_fetch_mswebview2(${WEBVIEW_MSWEBVIEW2_VERSION}) +- endif() +- find_package(MSWebView2 REQUIRED) +- if(MSWebView2_FOUND) +- list(APPEND WEBVIEW_DEPENDENCIES MSWebView2::headers) +- endif() +- endif() +- list(APPEND WEBVIEW_DEPENDENCIES advapi32 ole32 shell32 shlwapi user32 version) + endif() + endmacro() + diff --git a/net/freerdp3/files/patch-winpr_winpr.pc.in b/net/freerdp3/files/patch-winpr_winpr.pc.in deleted file mode 100644 index 6dae404bbf98..000000000000 --- a/net/freerdp3/files/patch-winpr_winpr.pc.in +++ /dev/null @@ -1,10 +0,0 @@ ---- winpr/winpr.pc.in.orig 2023-12-22 16:29:20 UTC -+++ winpr/winpr.pc.in -@@ -9,7 +9,6 @@ Description: WinPR: Windows Portable Runtime - URL: http://www.freerdp.com/ - Version: @WINPR_VERSION@ - Requires: --Requires.private: libssl - Libs: -L${libdir} ${libs} - Libs.private: -ldl -lrt -lm -lpthread - Cflags: -I${includedir} |