From owner-dev-commits-ports-all@freebsd.org Fri May 14 18:54:46 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CD727628457; Fri, 14 May 2021 18:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fhd4Q5Splz3CS0; Fri, 14 May 2021 18:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A008317804; Fri, 14 May 2021 18:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14EIskM5017893; Fri, 14 May 2021 18:54:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14EIsk5W017892; Fri, 14 May 2021 18:54:46 GMT (envelope-from git) Date: Fri, 14 May 2021 18:54:46 GMT Message-Id: <202105141854.14EIsk5W017892@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: ec8a052e5d1c - main - net-im/telegram-desktop: fix build with GTK option (again) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec8a052e5d1c8fb8c9440a879de5735c1e899766 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 May 2021 18:54:46 -0000 The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec8a052e5d1c8fb8c9440a879de5735c1e899766 commit ec8a052e5d1c8fb8c9440a879de5735c1e899766 Author: Charlie Li AuthorDate: 2021-05-14 18:47:28 +0000 Commit: Charlie Li 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 (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 >k = 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)