Attachment #729926 for bug #806292




    if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
        find_package(PkgConfig REQUIRED)

        pkg_check_modules(GTK REQUIRED gtk+-3.0)
        target_include_directories(lib_base PUBLIC ${GTK_INCLUDE_DIRS})
            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()
    endif()
endif()





#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 {

		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;

Return to bug 806292

Lines 254-266 elseif (LINUX) Link Here

(-)a/Telegram/lib_base/CMakeLists.txt (-7 / +2 lines)
254	if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)	254	if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
255	find_package(PkgConfig REQUIRED)	255	find_package(PkgConfig REQUIRED)
256		256
257	if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)	257	pkg_check_modules(GTK REQUIRED gtk+-3.0)
258	pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)	258	target_include_directories(lib_base PUBLIC ${GTK_INCLUDE_DIRS})
259	target_link_libraries(lib_base PUBLIC PkgConfig::GTK3)
260	else()
261	pkg_check_modules(GTK REQUIRED gtk+-3.0)
262	target_include_directories(lib_base PUBLIC ${GTK_INCLUDE_DIRS})
263	endif()
264	endif()	259	endif()
265	endif()	260	endif()
266		261

Lines 13-27 extern "C" { Link Here

(-)a/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration_p.h (-12 lines)
13	#include <gdk/gdk.h>	13	#include <gdk/gdk.h>
14	} // extern "C"	14	} // extern "C"
15		15
16	#if defined DESKTOP_APP_USE_PACKAGED && !defined DESKTOP_APP_USE_PACKAGED_LAZY
17	#define LINK_TO_GTK
18	#endif // DESKTOP_APP_USE_PACKAGED && !DESKTOP_APP_USE_PACKAGED_LAZY
19
20	#ifdef LINK_TO_GTK
21	#define LOAD_GTK_SYMBOL(lib, func) (func = ::func)
22	#else // LINK_TO_GTK
23	#define LOAD_GTK_SYMBOL LOAD_LIBRARY_SYMBOL	16	#define LOAD_GTK_SYMBOL LOAD_LIBRARY_SYMBOL
24	#endif // !LINK_TO_GTK
25		17
26	namespace base {	18	namespace base {
27	namespace Platform {	19	namespace Platform {
Lines 31-41 inline bool LoadGtkLibrary( Link Here
31	QLibrary &lib,	23	QLibrary &lib,
32	const char *name,	24	const char *name,
33	std::optional<int> version = std::nullopt) {	25	std::optional<int> version = std::nullopt) {
34	#ifdef LINK_TO_GTK
35	return true;
36	#else // LINK_TO_GTK
37	return LoadLibrary(lib, name, version);	26	return LoadLibrary(lib, name, version);
38	#endif // LINK_TO_GTK
39	}	27	}
40		28
41	inline gboolean (gtk_init_check)(int argc, char ***argv) = nullptr;	29	inline gboolean (gtk_init_check)(int argc, char ***argv) = nullptr;