git: ec8a052e5d1c - main - net-im/telegram-desktop: fix build with GTK option (again)

[Charlie Li]

The branch main has been updated by vishwin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ec8a052e5d1c8fb8c9440a879de5735c1e899766

commit ec8a052e5d1c8fb8c9440a879de5735c1e899766
Author:     Charlie Li <vishwin at FreeBSD.org>
AuthorDate: 2021-05-14 18:47:28 +0000
Commit:     Charlie Li <vishwin at FreeBSD.org>
CommitDate: 2021-05-14 18:54:29 +0000

    net-im/telegram-desktop: fix build with GTK option (again)
    
    Remove https://github.com/desktop-app/lib_webview/commit/48d70e5258754b2415b07c88f0376212596e09a7,
    as it depends on function changes from https://github.com/desktop-app/lib_base/commit/1b949f5ca250a47cd1261dd27fd83c174665f8fb
    
    Reported by:    madpilot
    Fixes:          80762637bb7d net-im/telegram-desktop: fix build with GTK option
    Pointy hat to:  vishwin
    Approved by:    Henry Hu <henry.hu.sh at gmail.com> (maintainer, implicit),
                    arrowd (mentor, implicit), fluffy (mentor, implicit)
    PR:             255719
---
 ...iew_webview_platform_linux_webview__linux__webkit__gtk.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkit__gtk.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkit__gtk.cpp
index 55842e691436..bc87e7122ff5 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkit__gtk.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkit__gtk.cpp
@@ -1,20 +1,11 @@
 --- Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp.orig	2021-04-14 05:42:51 UTC
 +++ Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp
-@@ -26,7 +26,7 @@ bool Resolve() {
- 	auto &gtk = BaseGtkIntegration::Instance()->library();
- 
- 	auto webkit2gtk = QLibrary();
--	const auto result =  LOAD_GTK_SYMBOL(gtk, gtk_widget_get_type)
-+	const auto result = LOAD_GTK_SYMBOL(gtk, gtk_widget_get_type)
- 		&& LOAD_GTK_SYMBOL(gtk, gtk_widget_grab_focus)
- 		&& LOAD_GTK_SYMBOL(gtk, gtk_container_get_type)
- 		&& LOAD_GTK_SYMBOL(gtk, gtk_container_add)
 @@ -38,7 +38,7 @@ bool Resolve() {
  		&& LOAD_GTK_SYMBOL(gtk, gtk_window_get_type)
  		&& LOAD_GTK_SYMBOL(gtk, gtk_window_set_decorated)
  		&& LOAD_GTK_SYMBOL(gtk, gdk_x11_window_get_xid)
 -		&& base::Platform::Gtk::LoadLibrary(webkit2gtk, "libwebkit2gtk-4.0.so.37", 0)
-+		&& base::Platform::Gtk::LoadGtkLibrary(webkit2gtk, "libwebkit2gtk-4.0.so.37")
++		&& base::Platform::Gtk::LoadLibrary(webkit2gtk, "libwebkit2gtk-4.0.so.37", 37)
  		&& LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_new)
  		&& LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_get_type)
  		&& LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_get_user_content_manager)