Add patch for building with gcc11; move gtk3 and webkit2gtk in makedeps

1 files changed, 106 insertions, 0 deletions

diff --git a/dlopen-gtk.patch b/dlopen-gtk.patch
new file mode 100644
index 000000000000..7f4fb54720bb
--- /dev/null
+++ b/dlopen-gtk.patch
@@ -0,0 +1,106 @@
+diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
+index fe177acf6..3adfac28d 100644
+--- a/Telegram/CMakeLists.txt
++++ b/Telegram/CMakeLists.txt
+@@ -116,21 +116,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(Telegram PRIVATE PkgConfig::GTK3)
++        pkg_search_module(GTK REQUIRED gtk+-3.0 gtk+-2.0)
++        target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS})
+ 
+-            if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
+-                pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
+-                target_link_libraries(Telegram PRIVATE PkgConfig::X11)
+-            endif()
+-        else()
+-            pkg_search_module(GTK REQUIRED gtk+-3.0 gtk+-2.0)
+-            target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS})
+-
+-            if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
+-                target_link_libraries(Telegram PRIVATE X11)
+-            endif()
++        if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
++            target_link_libraries(Telegram PRIVATE X11)
+         endif()
+     endif()
+ endif()
+Submodule Telegram/lib_base contains modified content
+diff --git a/Telegram/lib_base/CMakeLists.txt b/Telegram/lib_base/CMakeLists.txt
+index b413b47..e3f5973 100644
+--- a/Telegram/lib_base/CMakeLists.txt
++++ b/Telegram/lib_base/CMakeLists.txt
+@@ -242,21 +242,11 @@ if (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)
++        pkg_search_module(GTK REQUIRED gtk+-3.0 gtk+-2.0)
++        target_include_directories(lib_base PUBLIC ${GTK_INCLUDE_DIRS})
+ 
+-            if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
+-                pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
+-                target_link_libraries(lib_base PUBLIC PkgConfig::X11)
+-            endif()
+-        else()
+-            pkg_search_module(GTK REQUIRED gtk+-3.0 gtk+-2.0)
+-            target_include_directories(lib_base PUBLIC ${GTK_INCLUDE_DIRS})
+-
+-            if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
+-                target_link_libraries(lib_base PUBLIC X11)
+-            endif()
++        if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
++            target_link_libraries(lib_base PUBLIC X11)
+         endif()
+     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 73a5bb4..d9551df 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
+@@ -15,10 +15,6 @@ 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
+Submodule Telegram/lib_webview contains modified content
+diff --git a/Telegram/lib_webview/CMakeLists.txt b/Telegram/lib_webview/CMakeLists.txt
+index 1f26f0a..f725630 100644
+--- a/Telegram/lib_webview/CMakeLists.txt
++++ b/Telegram/lib_webview/CMakeLists.txt
+@@ -119,19 +119,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(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(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})
+     else()
+         remove_target_sources(lib_webview ${src_loc}
+             webview/platform/linux/webview_linux_webkit_gtk.cpp