View | Details | Raw Unified | Return to bug 255719 | Differences between
and this patch

Collapse All | Expand All

(-)b/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkit__gtk.cpp (-10 / +1 lines)
Lines 1-20 Link Here
1
--- Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp.orig	2021-04-14 05:42:51 UTC
1
--- Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp.orig	2021-04-14 05:42:51 UTC
2
+++ Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp
2
+++ Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp
3
@@ -26,7 +26,7 @@ bool Resolve() {
4
 	auto &gtk = BaseGtkIntegration::Instance()->library();
5
 
6
 	auto webkit2gtk = QLibrary();
7
-	const auto result =  LOAD_GTK_SYMBOL(gtk, gtk_widget_get_type)
8
+	const auto result = LOAD_GTK_SYMBOL(gtk, gtk_widget_get_type)
9
 		&& LOAD_GTK_SYMBOL(gtk, gtk_widget_grab_focus)
10
 		&& LOAD_GTK_SYMBOL(gtk, gtk_container_get_type)
11
 		&& LOAD_GTK_SYMBOL(gtk, gtk_container_add)
12
@@ -38,7 +38,7 @@ bool Resolve() {
3
@@ -38,7 +38,7 @@ bool Resolve() {
13
 		&& LOAD_GTK_SYMBOL(gtk, gtk_window_get_type)
4
 		&& LOAD_GTK_SYMBOL(gtk, gtk_window_get_type)
14
 		&& LOAD_GTK_SYMBOL(gtk, gtk_window_set_decorated)
5
 		&& LOAD_GTK_SYMBOL(gtk, gtk_window_set_decorated)
15
 		&& LOAD_GTK_SYMBOL(gtk, gdk_x11_window_get_xid)
6
 		&& LOAD_GTK_SYMBOL(gtk, gdk_x11_window_get_xid)
16
-		&& base::Platform::Gtk::LoadLibrary(webkit2gtk, "libwebkit2gtk-4.0.so.37", 0)
7
-		&& base::Platform::Gtk::LoadLibrary(webkit2gtk, "libwebkit2gtk-4.0.so.37", 0)
17
+		&& base::Platform::Gtk::LoadGtkLibrary(webkit2gtk, "libwebkit2gtk-4.0.so.37")
8
+		&& base::Platform::Gtk::LoadLibrary(webkit2gtk, "libwebkit2gtk-4.0.so.37", 37)
18
 		&& LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_new)
9
 		&& LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_new)
19
 		&& LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_get_type)
10
 		&& LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_get_type)
20
 		&& LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_get_user_content_manager)
11
 		&& LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_get_user_content_manager)

Return to bug 255719