[patch] 3rd patch

3.patch (text/plain), 1.71 KB, created by Ilia Durov on 2021-08-03 19:03:53 UTC

From 1eac61ac8b4db57edf3f4637e0f52e04e1421c6d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <[e-mail]>
Date: Mon, 19 Jul 2021 02:15:40 +0400
Subject: [PATCH] Always use QLibrary for webkit2gtk to avoid confusing dynamic
 linker

---
 CMakeLists.txt | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/Telegram/lib_webview/CMakeLists.txt b/Telegram/lib_webview/CMakeLists.txt
index bd2c35c..5c86f4f 100644
--- a/Telegram/lib_webview/CMakeLists.txt
+++ b/Telegram/lib_webview/CMakeLists.txt
@@ -51,19 +51,11 @@ elseif (LINUX)
     if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
         find_package(PkgConfig REQUIRED)
 
-        if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
-            pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)
-            target_link_libraries(lib_webview PUBLIC PkgConfig::GTK3)
+        pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+        target_include_directories(lib_webview PUBLIC ${GTK3_INCLUDE_DIRS})
 
-            pkg_check_modules(WEBKIT REQUIRED IMPORTED_TARGET webkit2gtk-4.0)
-            target_link_libraries(lib_webview PUBLIC PkgConfig::WEBKIT)
-        else()
-            pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
-            target_include_directories(lib_webview PUBLIC ${GTK3_INCLUDE_DIRS})
-
-            pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0)
-            target_include_directories(lib_webview PUBLIC ${WEBKIT_INCLUDE_DIRS})
-        endif()
+        pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0)
+        target_include_directories(lib_webview PUBLIC ${WEBKIT_INCLUDE_DIRS})
     else()
         remove_target_sources(lib_webview ${src_loc}
             webview/platform/linux/webview_linux_webkit_gtk.cpp