[patch] 2nd patch

2.patch (text/plain), 2.33 KB, created by Ilia Durov on 2021-08-03 19:03:38 UTC

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

---
 CMakeLists.txt                                     |  9 ++-------
 base/platform/linux/base_linux_gtk_integration_p.h | 12 ------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/Telegram/lib_base/CMakeLists.txt b/Telegram/lib_base/CMakeLists.txt
index b6b3aaf..4126dfc 100644
--- a/Telegram/lib_base/CMakeLists.txt
+++ b/Telegram/lib_base/CMakeLists.txt
@@ -254,13 +254,8 @@ 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_base PUBLIC PkgConfig::GTK3)
-        else()
-            pkg_check_modules(GTK REQUIRED gtk+-3.0)
-            target_include_directories(lib_base PUBLIC ${GTK_INCLUDE_DIRS})
-        endif()
+        pkg_check_modules(GTK REQUIRED gtk+-3.0)
+        target_include_directories(lib_base PUBLIC ${GTK_INCLUDE_DIRS})
     endif()
 endif()
 
diff --git a/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration_p.h b/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration_p.h
index 5d5f3b3..2abc94f 100644
--- a/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration_p.h
+++ b/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration_p.h
@@ -13,15 +13,7 @@ extern "C" {
 #include <gdk/gdk.h>
 } // extern "C"
 
-#if defined DESKTOP_APP_USE_PACKAGED && !defined DESKTOP_APP_USE_PACKAGED_LAZY
-#define LINK_TO_GTK
-#endif // DESKTOP_APP_USE_PACKAGED && !DESKTOP_APP_USE_PACKAGED_LAZY
-
-#ifdef LINK_TO_GTK
-#define LOAD_GTK_SYMBOL(lib, func) (func = ::func)
-#else // LINK_TO_GTK
 #define LOAD_GTK_SYMBOL LOAD_LIBRARY_SYMBOL
-#endif // !LINK_TO_GTK
 
 namespace base {
 namespace Platform {
@@ -31,11 +23,7 @@ inline bool LoadGtkLibrary(
 		QLibrary &lib,
 		const char *name,
 		std::optional<int> version = std::nullopt) {
-#ifdef LINK_TO_GTK
-	return true;
-#else // LINK_TO_GTK
 	return LoadLibrary(lib, name, version);
-#endif // LINK_TO_GTK
 }
 
 inline gboolean (*gtk_init_check)(int *argc, char ***argv) = nullptr;